chiark
/
gitweb
/
~ian
/
innduct.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian: Sort out some dependencies
[innduct.git]
/
help.c
diff --git
a/help.c
b/help.c
index 34b1018661ab7f29dee8d4711ed40ce42d98c5b5..46a784eb04d6817a469cdd9507536bfdadebb6cf 100644
(file)
--- a/
help.c
+++ b/
help.c
@@
-49,7
+49,7
@@
static void logcore(int sysloglevel, const char *fmt, ...) {
void logv(int sysloglevel, const char *pfx, int errnoval,
const char *fmt, va_list al) {
void logv(int sysloglevel, const char *pfx, int errnoval,
const char *fmt, va_list al) {
- char msgbuf[1024]; /* NB do not call
x
vasprintf here or you'll recurse */
+ char msgbuf[1024]; /* NB do not call
m
vasprintf here or you'll recurse */
vsnprintf(msgbuf,sizeof(msgbuf), fmt,al);
msgbuf[sizeof(msgbuf)-1]= 0;
vsnprintf(msgbuf,sizeof(msgbuf), fmt,al);
msgbuf[sizeof(msgbuf)-1]= 0;
@@
-97,16
+97,16
@@
DEFLOG(dbg, "debug", LOG_DEBUG, -1)
/*========== utility functions etc. ==========*/
/*========== utility functions etc. ==========*/
-char *
x
vasprintf(const char *fmt, va_list al) {
+char *
m
vasprintf(const char *fmt, va_list al) {
char *str;
int rc= vasprintf(&str,fmt,al);
if (rc<0) sysdie("vasprintf(\"%s\",...) failed", fmt);
return str;
}
char *str;
int rc= vasprintf(&str,fmt,al);
if (rc<0) sysdie("vasprintf(\"%s\",...) failed", fmt);
return str;
}
-char *
x
asprintf(const char *fmt, ...) {
+char *
m
asprintf(const char *fmt, ...) {
VA;
VA;
- char *str=
x
vasprintf(fmt,al);
+ char *str=
m
vasprintf(fmt,al);
va_end(al);
return str;
}
va_end(al);
return str;
}
@@
-127,12
+127,15
@@
void xclose_perhaps(int *fd, const char *what, const char *what2) {
*fd=0;
}
*fd=0;
}
-pid_t xfork(const char *what) {
- pid_t child;
-
- child= fork();
+pid_t xfork_bare(const char *what) {
+ pid_t child= fork();
if (child==-1) sysdie("cannot fork for %s",what);
dbg("forked %s %ld", what, (unsigned long)child);
if (child==-1) sysdie("cannot fork for %s",what);
dbg("forked %s %ld", what, (unsigned long)child);
+ return child;
+}
+
+pid_t xfork(const char *what) {
+ pid_t child= xfork_bare(what);
if (!child) postfork();
return child;
}
if (!child) postfork();
return child;
}