emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied patch from Matt Kraai to add v*error functions for handling vararg

Browse Source 
lists in a safe 'n sane fashion.
This commit is contained in:
Mark Whitley 2000-12-05 19:27:13 +00:00
parent d27753afd9
commit cf61fe14ae
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
utility.c
View File

@ -84,16 +84,21 @@ extern void usage(const char *usage)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
static void verrorMsg(const char *s, va_list p)
{
fflush(stdout);
fprintf(stderr, "%s: ", applet_name);
vfprintf(stderr, s, p);
fflush(stderr);
}
extern void errorMsg(const char *s, ...) extern void errorMsg(const char *s, ...)
{ {
va_list p; va_list p;
va_start(p, s); va_start(p, s);
fflush(stdout); verrorMsg(s, p);
fprintf(stderr, "%s: ", applet_name);
vfprintf(stderr, s, p);
va_end(p); va_end(p);
fflush(stderr);
} }
extern void fatalError(const char *s, ...) extern void fatalError(const char *s, ...)
@ -101,12 +106,21 @@ extern void fatalError(const char *s, ...)
va_list p; va_list p;
va_start(p, s); va_start(p, s);
verrorMsg(s, p);
va_end(p);
exit(EXIT_FAILURE);
}
static void vperrorMsg(const char *s, va_list p)
{
fflush(stdout); fflush(stdout);
fprintf(stderr, "%s: ", applet_name); fprintf(stderr, "%s: ", applet_name);
vfprintf(stderr, s, p); if (s && *s) {
va_end(p); vfprintf(stderr, s, p);
fputs(": ", stderr);
}
fprintf(stderr, "%s\n", strerror(errno));
fflush(stderr); fflush(stderr);
exit(EXIT_FAILURE);
} }
extern void perrorMsg(const char *s, ...) extern void perrorMsg(const char *s, ...)
@ -114,15 +128,8 @@ extern void perrorMsg(const char *s, ...)
va_list p; va_list p;
va_start(p, s); va_start(p, s);
fflush(stdout); vperrorMsg(s, p);
fprintf(stderr, "%s: ", applet_name);
if (s && *s) {
vfprintf(stderr, s, p);
fputs(": ", stderr);
}
fprintf(stderr, "%s\n", strerror(errno));
va_end(p); va_end(p);
fflush(stderr);
} }
extern void fatalPerror(const char *s, ...) extern void fatalPerror(const char *s, ...)
@ -130,15 +137,8 @@ extern void fatalPerror(const char *s, ...)
va_list p; va_list p;
va_start(p, s); va_start(p, s);
fflush(stdout); vperrorMsg(s, p);
fprintf(stderr, "%s: ", applet_name);
if (s && *s) {
vfprintf(stderr, s, p);
fputs(": ", stderr);
}
fprintf(stderr, "%s\n", strerror(errno));
va_end(p); va_end(p);
fflush(stderr);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }