generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-10-21 23:56:57 +02:00
Code Issues Projects Releases Wiki Activity

err: Rewrite warnc() and errc() family functions to be standalone

Browse Source 
Do not depend on the system vwarn() and verr() functions to implement
the *c() variants, as the system might actually lack any of the <err.h>
BSD extensions.
This commit is contained in:
Guillem Jover
2019-08-06 15:37:43 +02:00
parent f34a5f71d9
commit 9628798d7d
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/err.c
View File

@@ -1,6 +1,6 @@
/*
* Copyright © 2006 Robert Millan
* Copyright © 2011 Guillem Jover <guillem@hadrons.org>
* Copyright © 2011, 2019 Guillem Jover <guillem@hadrons.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,8 +26,21 @@
*/
#include <err.h>
#include <errno.h>
#include <string.h>
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
void
vwarnc(int code, const char *format, va_list ap)
{
fprintf(stderr, "%s: ", getprogname());
if (format) {
vfprintf(stderr, format, ap);
fprintf(stderr, ": ");
}
fprintf(stderr, "%s\n", strerror(code));
}
void
warnc(int code, const char *format, ...)
@@ -40,13 +53,15 @@ warnc(int code, const char *format, ...)
}
void
vwarnc(int code, const char *format, va_list ap)
verrc(int status, int code, const char *format, va_list ap)
{
int tmp = errno;
errno = code;
vwarn(format, ap);
errno = tmp;
fprintf(stderr, "%s: ", getprogname());
if (format) {
vfprintf(stderr, format, ap);
fprintf(stderr, ": ");
}
fprintf(stderr, "%s\n", strerror(code));
exit(status);
}
void
@@ -58,10 +73,3 @@ errc(int status, int code, const char *format, ...)
verrc(status, code, format, ap);
va_end(ap);
}
void
verrc(int status, int code, const char *format, va_list ap)
{
errno = code;
verr(status, format, ap);
}