xfoo => mfoo, rename

diff --git a/backends/innduct.c b/backends/innduct.c
index d59d888362c3fd838ecab027abec067ab0826f37..36dc8aac0e99454ceca11a43a10fb637879a73ee 100644 (file)
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -224,8 +224,8 @@ perl -ne 'print if m/-8\<-/..m/-\>8-/; print "\f" if m/-\^L-/' backends/innduct.
 #define NORET_PRINTF(f,a) __attribute__((__noreturn__,__format__(printf,f,a)))
 #define NORET             __attribute__((__noreturn__))
 
-#define NEW(ptr)              ((ptr)= zxmalloc(sizeof(*(ptr))))
-#define NEW_DECL(type,ptr) type ptr = zxmalloc(sizeof(*(ptr)))
+#define NEW(ptr)              ((ptr)= zmmalloc(sizeof(*(ptr))))
+#define NEW_DECL(type,ptr) type ptr = zmmalloc(sizeof(*(ptr)))
 
 #define DUMPV(fmt,pfx,v) fprintf(f, " " #v "=" fmt, pfx v);
 
@@ -562,7 +562,7 @@ static void logv(int sysloglevel, const char *pfx, int errnoval,
                 const char *fmt, va_list al) PRINTF(5,0);
 static void logv(int sysloglevel, const char *pfx, int errnoval,
                 const char *fmt, va_list al) {
-  char msgbuf[1024]; /* NB do not call xvasprintf here or you'll recurse */
+  char msgbuf[1024]; /* NB do not call mvasprintf here or you'll recurse */
   vsnprintf(msgbuf,sizeof(msgbuf), fmt,al);
   msgbuf[sizeof(msgbuf)-1]= 0;
 
@@ -608,17 +608,17 @@ logwrap(debug,    " debug",    LOG_DEBUG,   -1);
 
 /*========== utility functions etc. ==========*/
 
-static char *xvasprintf(const char *fmt, va_list al) PRINTF(1,0);
-static char *xvasprintf(const char *fmt, va_list al) {
+static char *mvasprintf(const char *fmt, va_list al) PRINTF(1,0);
+static char *mvasprintf(const char *fmt, va_list al) {
   char *str;
   int rc= vasprintf(&str,fmt,al);
   if (rc<0) sysdie("vasprintf(\"%s\",...) failed", fmt);
   return str;
 }
-static char *xasprintf(const char *fmt, ...) PRINTF(1,2);
-static char *xasprintf(const char *fmt, ...) {
+static char *masprintf(const char *fmt, ...) PRINTF(1,2);
+static char *masprintf(const char *fmt, ...) {
   VA;
-  char *str= xvasprintf(fmt,al);
+  char *str= mvasprintf(fmt,al);
   va_end(al);
   return str;
 }
@@ -629,17 +629,17 @@ static int close_perhaps(int *fd) {
   *fd=0;
   return r;
 }
-static void xclose(int fd, const char *what, const char *what2) {
+static void mclose(int fd, const char *what, const char *what2) {
   int r= close(fd);
   if (r) sysdie("close %s%s",what,what2?what2:"");
 }
-static void xclose_perhaps(int *fd, const char *what, const char *what2) {
+static void mclose_perhaps(int *fd, const char *what, const char *what2) {
   if (*fd <= 0) return;
-  xclose(*fd,what,what2);
+  mclose(*fd,what,what2);
   *fd=0;
 }
 
-static pid_t xfork(const char *what) {
+static pid_t mfork(const char *what) {
   pid_t child;
 
   child= fork();
@@ -677,7 +677,7 @@ static void report_child_status(const char *what, int status) {
   }
 }
 
-static int xwaitpid(pid_t *pid, const char *what) {
+static int mwaitpid(pid_t *pid, const char *what) {
   int status;
 
   int r= kill(*pid, SIGKILL);
@@ -692,41 +692,47 @@ static int xwaitpid(pid_t *pid, const char *what) {
   return status;
 }
 
-static void *zxmalloc(size_t sz) {
-  void *p= xmalloc(sz);
+static void *mmalloc(size_t sz) {
+  void *p= malloc(sz);
+  if (!p) sysdie("unable to malloc %lu bytes",(unsigned long)sz);
+  return p;
+}
+
+static void *zmmalloc(size_t sz) {
+  void *p= mmalloc(sz);
   memset(p,0,sz);
   return p;
 }
 
-static void xunlink(const char *path, const char *what) {
+static void munlink(const char *path, const char *what) {
   int r= unlink(path);
   if (r) sysdie("can't unlink %s %s", path, what);
 }
 
-static time_t xtime(void) {
+static time_t mtime(void) {
   time_t now= time(0);
   if (now==-1) sysdie("time(2) failed");
   return now;
 }
 
-static void xsigaction(int signo, const struct sigaction *sa) {
+static void msigaction(int signo, const struct sigaction *sa) {
   int r= sigaction(signo,sa,0);
   if (r) sysdie("sigaction failed for \"%s\"", strsignal(signo));
 }
 
-static void xsigsetdefault(int signo) {
+static void msigsetdefault(int signo) {
   struct sigaction sa;
   memset(&sa,0,sizeof(sa));
   sa.sa_handler= SIG_DFL;
-  xsigaction(signo,&sa);
+  msigaction(signo,&sa);
 }
 
-static void xgettimeofday(struct timeval *tv_r) {
+static void mgettimeofday(struct timeval *tv_r) {
   int r= gettimeofday(tv_r,0);
   if (r) sysdie("gettimeofday(2) failed");
 }
 
-static void xsetnonblock(int fd, int nonblocking) {
+static void msetnonblock(int fd, int nonblocking) {
   int errnoval= oop_fd_nonblock(fd, nonblocking);
   if (errnoval) { errno= errnoval; sysdie("setnonblocking"); }
 }
@@ -738,18 +744,18 @@ static void check_isreg(const struct stat *stab, const char *path,
        what, path, (unsigned long)stab->st_mode);
 }
 
-static void xfstat(int fd, struct stat *stab_r, const char *what) {
+static void mfstat(int fd, struct stat *stab_r, const char *what) {
   int r= fstat(fd, stab_r);
   if (r) sysdie("could not fstat %s", what);
 }
 
-static void xfstat_isreg(int fd, struct stat *stab_r,
+static void mfstat_isreg(int fd, struct stat *stab_r,
                         const char *path, const char *what) {
-  xfstat(fd, stab_r, what);
+  mfstat(fd, stab_r, what);
   check_isreg(stab_r, path, what);
 }
 
-static void xlstat_isreg(const char *path, struct stat *stab,
+static void mlstat_isreg(const char *path, struct stat *stab,
                         int *enoent_r /* 0 means ENOENT is fatal */,
                         const char *what) {
   int r= lstat(path, stab);
@@ -1050,7 +1056,7 @@ static void cli_init(void) {
   r= listen(cli_master, 5);
   if (r) NOCLI("listen to cli master socket");
 
-  xsetnonblock(cli_master, 1);
+  msetnonblock(cli_master, 1);
 
   loop->on_fd(loop, cli_master, OOP_READ, cli_master_readable, 0);
   info("cli ready, listening on %s", path_cli);
@@ -1058,7 +1064,7 @@ static void cli_init(void) {
   return;
 
  nocli:
-  xclose_perhaps(&cli_master, "cli master",0);
+  mclose_perhaps(&cli_master, "cli master",0);
   return;
 }
 
@@ -1136,7 +1142,7 @@ static void vconnfail(Conn *conn, const char *fmt, va_list al) {
 
   LIST_REMOVE(conns,conn);
 
-  char *m= xvasprintf(fmt,al);
+  char *m= mvasprintf(fmt,al);
   warn("C%d (now %d) connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s",
        conn->fd, conns.count, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
   free(m);
@@ -1231,14 +1237,14 @@ static int connecting_fdpass_sock;
 
 static void connect_attempt_discard(void) {
   if (connecting_child) {
-    int status= xwaitpid(&connecting_child, "connect");
+    int status= mwaitpid(&connecting_child, "connect");
     if (!(WIFEXITED(status) ||
          (WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL)))
       report_child_status("connect", status);
   }
   if (connecting_fdpass_sock) {
     cancel_fd_read_except(connecting_fdpass_sock);
-    xclose_perhaps(&connecting_fdpass_sock, "connecting fdpass socket",0);
+    mclose_perhaps(&connecting_fdpass_sock, "connecting fdpass socket",0);
   }
 }
 
@@ -1277,7 +1283,7 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
   struct cmsghdr *h= 0;
   if (rs >= 0) h= CMSG_FIRSTHDR(&msg);
   if (!h) {
-    int status= xwaitpid(&connecting_child, "connect child (broken)");
+    int status= mwaitpid(&connecting_child, "connect child (broken)");
 
     if (WIFEXITED(status)) {
       if (WEXITSTATUS(status) != 0 &&
@@ -1376,14 +1382,14 @@ static void connect_start(void) {
   int r= socketpair(AF_UNIX, SOCK_STREAM, 0, socks);
   if (r) { syswarn("connect: cannot create socketpair for child"); return; }
 
-  connecting_child= xfork("connection");
+  connecting_child= mfork("connection");
 
   if (!connecting_child) {
     FILE *cn_from, *cn_to;
     char buf[NNTP_STRLEN+100];
     int exitstatus= CONNCHILD_ESTATUS_NOSTREAM;
 
-    xclose(socks[0], "(in child) parent's connection fdpass socket",0);
+    mclose(socks[0], "(in child) parent's connection fdpass socket",0);
 
     alarm(connection_setup_timeout);
     if (NNTPconnect((char*)remote_host, port, &cn_from, &cn_to, buf) < 0) {
@@ -1459,9 +1465,9 @@ static void connect_start(void) {
     _exit(exitstatus);
   }
 
-  xclose(socks[1], "connecting fdpass child's socket",0);
+  mclose(socks[1], "connecting fdpass child's socket",0);
   connecting_fdpass_sock= socks[0];
-  xsetnonblock(connecting_fdpass_sock, 1);
+  msetnonblock(connecting_fdpass_sock, 1);
   on_fd_read_except(connecting_fdpass_sock, connchild_event);
 
   if (!conns.count)
@@ -2060,7 +2066,7 @@ static InputFile *open_input_file(const char *path) {
   }
   assert(fd>0);
 
-  InputFile *ipf= xmalloc(sizeof(*ipf) + strlen(path) + 1);
+  InputFile *ipf= mmalloc(sizeof(*ipf) + strlen(path) + 1);
   memset(ipf,0,sizeof(*ipf));
 
   ipf->fd= fd;
@@ -2076,7 +2082,7 @@ static void close_input_file(InputFile *ipf) { /* does not free */
   assert(!ipf->filemon); /* must have had inputfile_reading_stop */
   assert(!ipf->rd); /* must have had inputfile_reading_stop */
   assert(!ipf->inprogress); /* no dangling pointers pointing here */
-  xclose_perhaps(&ipf->fd, "input file ", ipf->path);
+  mclose_perhaps(&ipf->fd, "input file ", ipf->path);
 }
 
 
@@ -2155,7 +2161,7 @@ static void *feedfile_got_article(oop_source *lp, oop_read *rd,
 
   ipf->readcount_ok++;
 
-  art= xmalloc(sizeof(*art) - 1 + midlen + 1);
+  art= mmalloc(sizeof(*art) - 1 + midlen + 1);
   memset(art,0,sizeof(*art));
   art->state= art_Unchecked;
   art->midlen= midlen;
@@ -2324,7 +2330,7 @@ static int filemon_method_init(void) {
     syswarn("filemon/inotify: inotify_init failed");
     return 0;
   }
-  xsetnonblock(filemon_inotify_fd, 1);
+  msetnonblock(filemon_inotify_fd, 1);
   loop->on_fd(loop, filemon_inotify_fd, OOP_READ, filemon_inotify_readable, 0);
 
   debug("filemon inotify init filemon_inotify_fd=%d", filemon_inotify_fd);
@@ -2555,14 +2561,14 @@ static void statemc_lock(void) {
       sysfatal("fcntl F_SETLK lockfile %s", path_lock);
     }
 
-    xfstat_isreg(lockfd, &stabf, path_lock, "lockfile");
+    mfstat_isreg(lockfd, &stabf, path_lock, "lockfile");
     int lock_noent;
-    xlstat_isreg(path_lock, &stab, &lock_noent, "lockfile");
+    mlstat_isreg(path_lock, &stab, &lock_noent, "lockfile");
 
     if (!lock_noent && samefile(&stab, &stabf))
       break;
 
-    xclose(lockfd, "stale lockfile ", path_lock);
+    mclose(lockfd, "stale lockfile ", path_lock);
   }
 
   FILE *lockfile= fdopen(lockfd, "w");
@@ -2586,7 +2592,7 @@ static void statemc_init(void) {
   search_backlog_file();
 
   int defer_noent;
-  xlstat_isreg(path_defer, &stabdefer, &defer_noent, "defer file");
+  mlstat_isreg(path_defer, &stabdefer, &defer_noent, "defer file");
   if (defer_noent) {
     debug("startup: ductdefer ENOENT");
   } else {
@@ -2596,7 +2602,7 @@ static void statemc_init(void) {
       open_defer(); /* so that we will later close it and rename it */
       break;
     case 2:
-      xunlink(path_defer, "stale defer file link"
+      munlink(path_defer, "stale defer file link"
              " (presumably hardlink to backlog file)");
       break;
     default:
@@ -2609,13 +2615,13 @@ static void statemc_init(void) {
   int noent_f;
 
   InputFile *file_d= open_input_file(path_flushing);
-  if (file_d) xfstat_isreg(file_d->fd, &stab_d, path_flushing,"flushing file");
+  if (file_d) mfstat_isreg(file_d->fd, &stab_d, path_flushing,"flushing file");
 
-  xlstat_isreg(feedfile, &stab_f, &noent_f, "feedfile");
+  mlstat_isreg(feedfile, &stab_f, &noent_f, "feedfile");
 
   if (!noent_f && file_d && samefile(&stab_f, &stab_d)) {
     debug("startup: F==D => Hardlinked");
-    xunlink(feedfile, "feed file (during startup)"); /* => Moved */
+    munlink(feedfile, "feed file (during startup)"); /* => Moved */
     noent_f= 1;
   }
 
@@ -2657,7 +2663,7 @@ static void statemc_start_flush(const char *why) { /* Normal => Flushing */
                  feedfile, path_flushing);
   /* => Hardlinked */
 
-  xunlink(feedfile, "old feedfile link");
+  munlink(feedfile, "old feedfile link");
   /* => Moved */
 
   spawn_inndcomm_flush(why); /* => Flushing FLUSHING */
@@ -2715,11 +2721,11 @@ static void notice_processed(InputFile *ipf, int completed,
 #define CNT(art,rc) (ipf->counts[art_##art][RC_##rc])
 
   char *inprog= completed
-    ? xasprintf("%s","") /* GCC produces a stupid warning for printf("") ! */
-    : xasprintf(" inprogress=%ld", ipf->inprogress);
+    ? masprintf("%s","") /* GCC produces a stupid warning for printf("") ! */
+    : masprintf(" inprogress=%ld", ipf->inprogress);
   char *autodefer= ipf->autodefer >= 0
-    ? xasprintf(" autodeferred=%ld", ipf->autodefer)
-    : xasprintf("%s","");
+    ? masprintf(" autodeferred=%ld", ipf->autodefer)
+    : masprintf("%s","");
 
   info("%s %s%s read=%d (+bl=%d,+err=%d)%s%s"
        " missing=%d offered=%d (ch=%d,nc=%d) accepted=%d (ch=%d,nc=%d)"
@@ -2776,7 +2782,7 @@ static void statemc_check_flushing_done(void) {
 
   close_defer();
 
-  xunlink(path_flushing, "old flushing file");
+  munlink(path_flushing, "old flushing file");
 
   close_input_file(flushing_input_file);
   free(flushing_input_file);
@@ -2841,7 +2847,7 @@ static void open_defer(void) {
 
   /* truncate away any half-written records */
 
-  xfstat_isreg(fileno(defer), &stab, path_defer, "newly opened defer file");
+  mfstat_isreg(fileno(defer), &stab, path_defer, "newly opened defer file");
 
   if (stab.st_size > LONG_MAX)
     die("defer file %s size is far too large", path_defer);
@@ -2890,14 +2896,14 @@ static void close_defer(void) {
     return;
 
   struct stat stab;
-  xfstat_isreg(fileno(defer), &stab, path_defer, "defer file");
+  mfstat_isreg(fileno(defer), &stab, path_defer, "defer file");
 
   if (fclose(defer)) sysfatal("could not close defer file %s", path_defer);
   defer= 0;
 
-  time_t now= xtime();
+  time_t now= mtime();
 
-  char *backlog= xasprintf("%s_backlog_%lu.%lu", feedfile,
+  char *backlog= masprintf("%s_backlog_%lu.%lu", feedfile,
                           (unsigned long)now,
                           (unsigned long)stab.st_ino);
   if (link(path_defer, backlog))
@@ -2980,14 +2986,14 @@ static void search_backlog_file(void) {
       if (r && errno!=ENOENT)
        syswarn("failed to unlink cli socket for old feed");
 
-      xunlink(path_lock, "lockfile for old feed");
+      munlink(path_lock, "lockfile for old feed");
       exit(4);
     }
     until_backlog_nextscan= backlog_spontrescan_periods;
     goto xfree;
   }
 
-  now= xtime();
+  now= mtime();
   double age= difftime(now, oldest_mtime);
   long age_deficiency= (backlog_retry_minperiods * period_seconds) - age;
 
@@ -3035,7 +3041,7 @@ static int signal_self_pipe[2];
 static sig_atomic_t terminate_sig_flag;
 
 static void raise_default(int signo) {
-  xsigsetdefault(signo);
+  msigsetdefault(signo);
   raise(signo);
   abort();
 }
@@ -3073,15 +3079,15 @@ static void init_signals(void) {
 
   if (pipe(signal_self_pipe)) sysfatal("create self-pipe for signals");
 
-  xsetnonblock(signal_self_pipe[0],1);
-  xsetnonblock(signal_self_pipe[1],1);
+  msetnonblock(signal_self_pipe[0],1);
+  msetnonblock(signal_self_pipe[1],1);
 
   struct sigaction sa;
   memset(&sa,0,sizeof(sa));
   sa.sa_handler= sigarrived_handler;
   sa.sa_flags= SA_RESTART;
-  xsigaction(SIGTERM,&sa);
-  xsigaction(SIGINT,&sa);
+  msigaction(SIGTERM,&sa);
+  msigaction(SIGINT,&sa);
 
   on_fd_read_except(signal_self_pipe[0], sigarrived_event);
 }
@@ -3094,11 +3100,11 @@ static int inndcomm_sentinel_fd;
 static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
   assert(inndcomm_child);
   assert(fd == inndcomm_sentinel_fd);
-  int status= xwaitpid(&inndcomm_child, "inndcomm");
+  int status= mwaitpid(&inndcomm_child, "inndcomm");
   inndcomm_child= 0;
   
   cancel_fd_read_except(fd);
-  xclose_perhaps(&fd, "inndcomm sentinel pipe",0);
+  mclose_perhaps(&fd, "inndcomm sentinel pipe",0);
   inndcomm_sentinel_fd= 0;
 
   assert(!flushing_input_file);
@@ -3181,14 +3187,14 @@ void spawn_inndcomm_flush(const char *why) { /* Moved => Flushing */
 
   if (pipe(pipefds)) sysfatal("create pipe for inndcomm child sentinel");
 
-  inndcomm_child= xfork("inndcomm child");
+  inndcomm_child= mfork("inndcomm child");
 
   if (!inndcomm_child) {
     const char *flushargv[2]= { sitename, 0 };
     char *reply;
     int r;
 
-    xclose(pipefds[0], "(in child) inndcomm sentinel parent's end",0);
+    mclose(pipefds[0], "(in child) inndcomm sentinel parent's end",0);
     /* parent spots the autoclose of pipefds[1] when we die or exit */
 
     if (simulate_flush>=0) {
@@ -3209,7 +3215,7 @@ void spawn_inndcomm_flush(const char *why) { /* Moved => Flushing */
 
   simulate_flush= -1;
 
-  xclose(pipefds[1], "inndcomm sentinel child's end",0);
+  mclose(pipefds[1], "inndcomm sentinel child's end",0);
   inndcomm_sentinel_fd= pipefds[0];
   assert(inndcomm_sentinel_fd);
   on_fd_read_except(inndcomm_sentinel_fd, inndcomm_event);
@@ -3221,7 +3227,7 @@ void spawn_inndcomm_flush(const char *why) { /* Moved => Flushing */
 
 static void postfork_inputfile(InputFile *ipf) {
   if (!ipf) return;
-  xclose(ipf->fd, "(in child) input file ", ipf->path);
+  mclose(ipf->fd, "(in child) input file ", ipf->path);
 }
 
 static void postfork_stdio(FILE *f, const char *what, const char *what2) {
@@ -3233,9 +3239,9 @@ static void postfork_stdio(FILE *f, const char *what, const char *what2) {
 static void postfork(void) {
   in_child= 1;
 
-  xsigsetdefault(SIGTERM);
-  xsigsetdefault(SIGINT);
-  xsigsetdefault(SIGPIPE);
+  msigsetdefault(SIGTERM);
+  msigsetdefault(SIGINT);
+  msigsetdefault(SIGPIPE);
   if (terminate_sig_flag) raise(terminate_sig_flag);
 
   postfork_inputfile(main_input_file);
@@ -3260,7 +3266,7 @@ static void every_schedule(Every *e, struct timeval base);
 static void *every_happens(oop_source *lp, struct timeval base, void *e_v) {
   Every *e= e_v;
   e->f();
-  if (!e->fixed_rate) xgettimeofday(&base);
+  if (!e->fixed_rate) mgettimeofday(&base);
   every_schedule(e, base);
   return OOP_CONTINUE;
 }
@@ -3278,7 +3284,7 @@ static void every(int interval, int fixed_rate, void (*f)(void)) {
   e->fixed_rate= fixed_rate;
   e->f= f;
   struct timeval now;
-  xgettimeofday(&now);
+  mgettimeofday(&now);
   every_schedule(e, now);
 }
 
@@ -3288,12 +3294,12 @@ static void filepoll(void) {
 }
 
 static char *debug_report_ipf(InputFile *ipf) {
-  if (!ipf) return xasprintf("none");
+  if (!ipf) return masprintf("none");
 
   const char *slash= strrchr(ipf->path,'/');
   const char *path= slash ? slash+1 : ipf->path;
 
-  return xasprintf("%p/%s:queue=%d,ip=%ld,autodef=%ld,off=%ld,fd=%d%s%s%s",
+  return masprintf("%p/%s:queue=%d,ip=%ld,autodef=%ld,off=%ld,fd=%d%s%s%s",
                   ipf, path,
                   ipf->queue.count, ipf->inprogress, ipf->autodefer,
                   (long)ipf->offset, ipf->fd,
@@ -3444,8 +3450,8 @@ CCMD(dump) {
       const XmitDetails *xd= &conn->xmitd[i];
       char *dinfo;
       switch (xd->kind) {
-      case xk_Const:    dinfo= xasprintf("Const");                 break;
-      case xk_Artdata:  dinfo= xasprintf("A%p", xd->info.sm_art);  break;
+      case xk_Const:    dinfo= masprintf("Const");                 break;
+      case xk_Artdata:  dinfo= masprintf("A%p", xd->info.sm_art);  break;
       default:
        abort();
       }
@@ -3475,7 +3481,7 @@ CCMD(dump) {
 
 static void vbadusage(const char *fmt, va_list al) NORET_PRINTF(1,0);
 static void vbadusage(const char *fmt, va_list al) {
-  char *m= xvasprintf(fmt,al);
+  char *m= mvasprintf(fmt,al);
   fprintf(stderr, "bad usage: %s\n"
          "say --help for help, or read the manpage\n",
          m);
@@ -3568,7 +3574,7 @@ static void print_options(const Option *options, FILE *f) {
   const Option *o;
   for (o=options; o->shrt || o->lng; o++) {
     char shrt[2] = { o->shrt, 0 };
-    char *optspec= xasprintf("%s%s%s%s%s",
+    char *optspec= masprintf("%s%s%s%s%s",
                             o->shrt ? "-" : "", shrt,
                             o->shrt && o->lng ? "|" : "",
                             DELIMPERHAPS("--", o->lng));
@@ -3756,19 +3762,19 @@ int main(int argc, char **argv) {
   if (!feedfile) feedfile= sitename;
   if (!feedfile[0]) badusage("feed filename, if specified, must be nonempty");
   if (path_ends_slash(feedfile))
-    feedfile= xasprintf("%s%s", feedfile, sitename);
+    feedfile= masprintf("%s%s", feedfile, sitename);
   if (feedfile[0] != '/')
-    feedfile= xasprintf("%s/%s", innconf->pathoutgoing, feedfile);
+    feedfile= masprintf("%s/%s", innconf->pathoutgoing, feedfile);
 
   if (!path_cli) {
     path_cli_dir= "innduct";
   } else if (!path_cli[0] || !strcmp(path_cli,"none")) {
     path_cli= 0; /* ok, don't then */
   } else if (path_ends_slash(path_cli)) {
-    path_cli_dir= xasprintf("%.*s", strlen(path_cli)-1, path_cli);
+    path_cli_dir= masprintf("%.*s", strlen(path_cli)-1, path_cli);
   }
   if (path_cli_dir)
-    path_cli= xasprintf("%s/%s", path_cli_dir, sitename);
+    path_cli= masprintf("%s/%s", path_cli_dir, sitename);
 
   if (max_queue_per_ipf<0)
     max_queue_per_ipf= max_queue_per_conn * 2;
@@ -3789,11 +3795,11 @@ int main(int argc, char **argv) {
 
   /* set things up */
 
-  path_lock=        xasprintf("%s_lock",      feedfile);
-  path_flushing=    xasprintf("%s_flushing",  feedfile);
-  path_defer=       xasprintf("%s_defer",     feedfile);
-  path_dump=        xasprintf("%s_dump",      feedfile);
-  globpat_backlog=  xasprintf("%s_backlog*",  feedfile);
+  path_lock=        masprintf("%s_lock",      feedfile);
+  path_flushing=    masprintf("%s_flushing",  feedfile);
+  path_defer=       masprintf("%s_defer",     feedfile);
+  path_dump=        masprintf("%s_dump",      feedfile);
+  globpat_backlog=  masprintf("%s_backlog*",  feedfile);
 
   oop_source_sys *sysloop= oop_sys_new();
   if (!sysloop) sysdie("could not create liboop event loop");
@@ -3817,15 +3823,15 @@ int main(int argc, char **argv) {
     dup2(null,0);
     dup2(null,1);
     dup2(null,2);
-    xclose(null, "/dev/null original fd",0);
+    mclose(null, "/dev/null original fd",0);
 
-    pid_t child1= xfork("daemonise first fork");
+    pid_t child1= mfork("daemonise first fork");
     if (child1) _exit(0);
 
     pid_t sid= setsid();
     if (sid == -1) sysfatal("setsid failed");
 
-    pid_t child2= xfork("daemonise second fork");
+    pid_t child2= mfork("daemonise second fork");
     if (child2) _exit(0);
   }