X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=backends%2Finnduct.c;h=85e5d6541ebb036da8709f265597b1f0c090b782;hb=d3f32ccfd4a014eb5dac4e36efdcb7d95c57c451;hp=a7679334ca196e01445d645f5135017f4e425b26;hpb=3df79b4d579a18b4138463457f6266adce966474;p=inn-innduct.git

diff --git a/backends/innduct.c b/backends/innduct.c
index a767933..85e5d65 100644
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -217,7 +217,7 @@ perl -ne 'print if m/-8\<-/..m/-\>8-/; print "\f" if m/-\^L-/' backends/innduct.
 #define INNDCOMMCHILD_ESTATUS_NONESUCH 27
 
 #define MAX_LINE_FEEDFILE (NNTP_MSGID_MAXLEN + sizeof(TOKEN)*2 + 10)
-#define MAX_CONTROL_COMMAND 1000
+#define MAX_CLI_COMMAND 1000
 
 #define VA                va_list al;  va_start(al,fmt)
 #define PRINTF(f,a)       __attribute__((__format__(printf,f,a)))
@@ -293,7 +293,7 @@ typedef struct InputFile InputFile;
 typedef struct XmitDetails XmitDetails;
 typedef struct Filemon_Perfile Filemon_Perfile;
 typedef enum StateMachineState StateMachineState;
-typedef struct ControlCommand ControlCommand;
+typedef struct CliCommand CliCommand;
 
 DEFLIST(Conn);
 DEFLIST(Article);
@@ -343,7 +343,7 @@ static void inputfile_reading_resume(InputFile *ipf);
 
 static void filemon_start(InputFile *ipf);
 static void filemon_stop(InputFile *ipf);
-static void filemon_callback(InputFile *ipf);
+static void tailing_make_readable(InputFile *ipf);
 
 static void vconnfail(Conn *conn, const char *fmt, va_list al) PRINTF(2,0);
 static void connfail(Conn *conn, const char *fmt, ...)         PRINTF(2,3);
@@ -356,7 +356,7 @@ static oop_rd_call peer_rd_err, peer_rd_ok;
 /* when changing defaults, remember to update the manpage */
 
 static const char *sitename, *remote_host;
-static const char *feedfile, *path_control;
+static const char *feedfile, *path_run, *path_cli, *path_cli_dir;
 static int quiet_multiple=0;
 static int become_daemon=1, try_filemon=1;
 static int try_stream=1;
@@ -379,7 +379,7 @@ static double nocheck_decay= 100; /* conv'd from articles to lambda by main */
 /* all these are initialised to seconds, and converted to periods in main */
 static int reconnect_delay_periods=1000;
 static int flushfail_retry_periods=1000;
-static int backlog_retry_minperiods=50;
+static int backlog_retry_minperiods=100;
 static int backlog_spontrescan_periods=300;
 static int spontaneous_flush_periods=100000;
 static int max_separated_periods=2000;
@@ -457,7 +457,7 @@ struct InputFile {
 
   oop_read *rd; /* non-0: reading; 0: constructing, or had EOF */
   off_t offset;
-  int skippinglong, paused;
+  int skippinglong, paused, fake_readable;
 
   ArticleList queue;
   long inprogress; /* includes queue.count and also articles in conns */
@@ -783,13 +783,13 @@ static int isewouldblock(int errnoval) {
   return errnoval==EWOULDBLOCK || errnoval==EAGAIN;
 }
 
-/*========== command and control connections ==========*/
+/*========== command and control (CLI) connections ==========*/
 
-static int control_master;
+static int cli_master;
 
-typedef struct ControlConn ControlConn;
-struct ControlConn {
-  void (*destroy)(ControlConn*);
+typedef struct CliConn CliConn;
+struct CliConn {
+  void (*destroy)(CliConn*);
   int fd;
   oop_read *rd;
   FILE *out;
@@ -800,46 +800,46 @@ struct ControlConn {
   socklen_t salen;
 };
 
-static const oop_rd_style control_rd_style= {
+static const oop_rd_style cli_rd_style= {
   OOP_RD_DELIM_STRIP, '\n',
   OOP_RD_NUL_FORBID,
   OOP_RD_SHORTREC_FORBID
 };
 
-static void control_destroy(ControlConn *cc) {
+static void cli_destroy(CliConn *cc) {
   cc->destroy(cc);
 }
 
-static void control_checkouterr(ControlConn *cc /* may destroy*/) {
+static void cli_checkouterr(CliConn *cc /* may destroy*/) {
   if (ferror(cc->out) | fflush(cc->out)) {
     info("CTRL%d write error %s", cc->fd, strerror(errno));
-    control_destroy(cc);
+    cli_destroy(cc);
   }
 }
 
-static void control_prompt(ControlConn *cc /* may destroy*/) {
+static void cli_prompt(CliConn *cc /* may destroy*/) {
   fprintf(cc->out, "%s| ", sitename);
-  control_checkouterr(cc);
+  cli_checkouterr(cc);
 }
 
-struct ControlCommand {
+struct CliCommand {
   const char *cmd;
-  void (*f)(ControlConn *cc, const ControlCommand *ccmd,
+  void (*f)(CliConn *cc, const CliCommand *ccmd,
 	    const char *arg, size_t argsz);
   void *xdata;
   int xval;
 };
 
-static const ControlCommand control_commands[];
+static const CliCommand cli_commands[];
 
-#define CCMD(wh)							\
-  static void ccmd_##wh(ControlConn *cc, const ControlCommand *c,	\
+#define CCMD(wh)						\
+  static void ccmd_##wh(CliConn *cc, const CliCommand *c,	\
 			const char *arg, size_t argsz)
 
 CCMD(help) {
   fputs("commands:\n", cc->out);
-  const ControlCommand *ccmd;
-  for (ccmd=control_commands; ccmd->cmd; ccmd++)
+  const CliCommand *ccmd;
+  for (ccmd=cli_commands; ccmd->cmd; ccmd++)
     fprintf(cc->out, " %s\n", ccmd->cmd);
   fputs("NB: permissible arguments are not shown above."
 	"  Not all commands listed are safe.  See innduct(8).\n", cc->out);
@@ -865,7 +865,7 @@ CCMD(setintarg) { *(int*)c->xdata= atoi(arg); }
 CCMD(setint) { *(int*)c->xdata= c->xval; }
 CCMD(setint_period) { *(int*)c->xdata= c->xval; period(); }
 
-static const ControlCommand control_commands[]= {
+static const CliCommand cli_commands[]= {
   { "h",             ccmd_help      },
   { "flush",         ccmd_flush     },
   { "stop",          ccmd_stop      },
@@ -886,10 +886,10 @@ POKES("prod ", ccmd_setint_period)
   { 0 }
 };
 
-static void *control_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
-			   const char *errmsg, int errnoval,
-			   const char *data, size_t recsz, void *cc_v) {
-  ControlConn *cc= cc_v;
+static void *cli_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
+		       const char *errmsg, int errnoval,
+		       const char *data, size_t recsz, void *cc_v) {
+  CliConn *cc= cc_v;
 
   if (!data) {
     info("CTRL%d closed", cc->fd);
@@ -899,8 +899,8 @@ static void *control_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
 
   if (recsz == 0) goto prompt;
 
-  const ControlCommand *ccmd;
-  for (ccmd=control_commands; ccmd->cmd; ccmd++) {
+  const CliCommand *ccmd;
+  for (ccmd=cli_commands; ccmd->cmd; ccmd++) {
     int l= strlen(ccmd->cmd);
     if (recsz < l) continue;
     if (recsz > l && data[l] != ' ') continue;
@@ -914,36 +914,36 @@ static void *control_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
   fputs("unknown command; h for help\n", cc->out);
 
  prompt:
-  control_prompt(cc);
+  cli_prompt(cc);
   return OOP_CONTINUE;
 }
 
-static void *control_rd_err(oop_source *lp, oop_read *oread, oop_rd_event ev,
-			    const char *errmsg, int errnoval,
-			    const char *data, size_t recsz, void *cc_v) {
-  ControlConn *cc= cc_v;
+static void *cli_rd_err(oop_source *lp, oop_read *oread, oop_rd_event ev,
+			const char *errmsg, int errnoval,
+			const char *data, size_t recsz, void *cc_v) {
+  CliConn *cc= cc_v;
   
   info("CTRL%d read error %s", cc->fd, errmsg);
   cc->destroy(cc);
   return OOP_CONTINUE;
 }
 
-static int control_conn_startup(ControlConn *cc /* may destroy*/,
+static int cli_conn_startup(CliConn *cc /* may destroy*/,
 				const char *how) {
   cc->rd= oop_rd_new_fd(loop, cc->fd, 0,0);
-  if (!cc->rd) { warn("oop_rd_new_fd control failed"); return -1; }
+  if (!cc->rd) { warn("oop_rd_new_fd cli failed"); return -1; }
 
-  int er= oop_rd_read(cc->rd, &control_rd_style, MAX_CONTROL_COMMAND,
-		      control_rd_ok, cc,
-		      control_rd_err, cc);
-  if (er) { errno= er; syswarn("oop_rd_read control failed"); return -1; }
+  int er= oop_rd_read(cc->rd, &cli_rd_style, MAX_CLI_COMMAND,
+		      cli_rd_ok, cc,
+		      cli_rd_err, cc);
+  if (er) { errno= er; syswarn("oop_rd_read cli failed"); return -1; }
 
   info("CTRL%d %s ready", cc->fd, how);
-  control_prompt(cc);
+  cli_prompt(cc);
   return 0;
 }
 
-static void control_stdio_destroy(ControlConn *cc) {
+static void cli_stdio_destroy(CliConn *cc) {
   if (cc->rd) {
     oop_rd_cancel(cc->rd);
     errno= oop_rd_delete_tidy(cc->rd);
@@ -952,17 +952,17 @@ static void control_stdio_destroy(ControlConn *cc) {
   free(cc);
 }
 
-static void control_stdio(void) {
-  NEW_DECL(ControlConn *,cc);
-  cc->destroy= control_stdio_destroy;
+static void cli_stdio(void) {
+  NEW_DECL(CliConn *,cc);
+  cc->destroy= cli_stdio_destroy;
 
   cc->fd= 0;
   cc->out= stdout;
-  int r= control_conn_startup(cc,"stdio");
+  int r= cli_conn_startup(cc,"stdio");
   if (r) cc->destroy(cc);
 }
 
-static void control_accepted_destroy(ControlConn *cc) {
+static void cli_accepted_destroy(CliConn *cc) {
   if (cc->rd) {
     oop_rd_cancel(cc->rd);
     oop_rd_delete_kill(cc->rd);
@@ -972,19 +972,19 @@ static void control_accepted_destroy(ControlConn *cc) {
   free(cc);
 }
 
-static void *control_master_readable(oop_source *lp, int master,
-				     oop_event ev, void *u) {
-  NEW_DECL(ControlConn *,cc);
-  cc->destroy= control_accepted_destroy;
+static void *cli_master_readable(oop_source *lp, int master,
+				 oop_event ev, void *u) {
+  NEW_DECL(CliConn *,cc);
+  cc->destroy= cli_accepted_destroy;
 
   cc->salen= sizeof(cc->sa);
   cc->fd= accept(master, &cc->sa.sa, &cc->salen);
-  if (cc->fd<0) { syswarn("error accepting control connection"); goto x; }
+  if (cc->fd<0) { syswarn("error accepting cli connection"); goto x; }
 
   cc->out= fdopen(cc->fd, "w");
-  if (!cc->out) { syswarn("error fdopening accepted control conn"); goto x; }
+  if (!cc->out) { syswarn("error fdopening accepted cli connection"); goto x; }
 
-  int r= control_conn_startup(cc, "accepted");
+  int r= cli_conn_startup(cc, "accepted");
   if (r) goto x;
 
   return OOP_CONTINUE;
@@ -994,12 +994,12 @@ static void *control_master_readable(oop_source *lp, int master,
   return OOP_CONTINUE;
 }
 
-#define NOCONTROL(...) do{						\
-    syswarn("no control socket, because failed to " __VA_ARGS__);	\
-    goto nocontrol;							\
+#define NOCLI(...) do{						\
+    syswarn("no cli listener, because failed to " __VA_ARGS__);	\
+    goto nocli;							\
   }while(0)
 
-static void control_init(void) {
+static void cli_init(void) {
   union {
     struct sockaddr sa;
     struct sockaddr_un un;
@@ -1008,37 +1008,50 @@ static void control_init(void) {
   memset(&sa,0,sizeof(sa));
   int maxlen= sizeof(sa.un.sun_path);
 
-  int pathlen= strlen(path_control);
-  if (pathlen > maxlen)
-    NOCONTROL("control socket path %s too long (%d>%d)",
-	      path_control, pathlen, maxlen);
+  if (!path_cli) {
+    info("control command line disabled");
+    return;
+  }
+
+  int pathlen= strlen(path_cli);
+  if (pathlen > maxlen) {
+    warn("no cli listener, because cli socket path %s too long (%d>%d)",
+	 path_cli, pathlen, maxlen);
+    return;
+  }
+
+  if (path_cli_dir) {
+    int r= mkdir(path_cli_dir, 0700);
+    if (r && errno!=EEXIST)
+      NOCLI("create cli socket directory %s", path_cli_dir);
+  }
 
-  int r= unlink(path_control);
+  int r= unlink(path_cli);
   if (r && errno!=ENOENT)
-    NOCONTROL("remove old control socket %s", path_control);
+    NOCLI("remove old cli socket %s", path_cli);
 
-  control_master= socket(PF_UNIX, SOCK_STREAM, 0);
-  if (control_master<0) NOCONTROL("create new control socket");
+  cli_master= socket(PF_UNIX, SOCK_STREAM, 0);
+  if (cli_master<0) NOCLI("create new cli master socket");
 
-  int sl= strlen(sa.un.sun_path) + offsetof(struct sockaddr_un, sun_path);
+  int sl= pathlen + offsetof(struct sockaddr_un, sun_path);
   sa.un.sun_family= AF_UNIX;
-  memcpy(sa.un.sun_path, path_control, pathlen);
+  memcpy(sa.un.sun_path, path_cli, pathlen);
 
-  r= bind(control_master, &sa.sa, sl);
-  if (r) NOCONTROL("bind to control socket path %s", sa.un.sun_path);
+  r= bind(cli_master, &sa.sa, sl);
+  if (r) NOCLI("bind to cli socket path %s", sa.un.sun_path);
 
-  r= listen(control_master, 5);
-  if (r) NOCONTROL("listen");
+  r= listen(cli_master, 5);
+  if (r) NOCLI("listen to cli master socket");
 
-  xsetnonblock(control_master, 1);
+  xsetnonblock(cli_master, 1);
 
-  loop->on_fd(loop, control_master, OOP_READ, control_master_readable, 0);
-  info("control socket ok, listening on %s", path_control);
+  loop->on_fd(loop, cli_master, OOP_READ, cli_master_readable, 0);
+  info("cli ready, listening on %s", path_cli);
 
   return;
 
- nocontrol:
-  xclose_perhaps(&control_master, "control master",0);
+ nocli:
+  xclose_perhaps(&cli_master, "cli master",0);
   return;
 }
 
@@ -1103,12 +1116,13 @@ static void vconnfail(Conn *conn, const char *fmt, va_list al) {
   for (i=0, d=conn->xmitd; i<conn->xmitu; i++, d++)
     xmit_free(d);
 
+  LIST_REMOVE(conns,conn);
+
   char *m= xvasprintf(fmt,al);
-  warn("C%d connection failed (requeueing " RCI_TRIPLE_FMT_BASE "): %s",
-       conn->fd, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
+  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);
 
-  LIST_REMOVE(conns,conn);
   conn_dispose(conn);
   check_assign_articles();
 }
@@ -1285,8 +1299,9 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
 		     &peer_rd_err, conn);
   if (r) sysdie("oop_rd_read for peer (fd=%d)",conn->fd);
 
-  notice("C%d connected %s", conn->fd, conn->stream ? "streaming" : "plain");
   LIST_ADDHEAD(conns, conn);
+  notice("C%d (now %d) connected %s",
+	 conn->fd, conns.count, conn->stream ? "streaming" : "plain");
 
   connect_attempt_discard();
   check_assign_articles();
@@ -1648,15 +1663,18 @@ static void *conn_write_some_xmits(Conn *conn) {
     assert(rs > 0);
 
     int done;
-    for (done=0; rs && done<conn->xmitu; done++) {
+    for (done=0; rs; ) {
+      assert(done<conn->xmitu);
       struct iovec *vp= &conn->xmit[done];
       XmitDetails *dp= &conn->xmitd[done];
-      if (rs > vp->iov_len) {
+      if (rs >= vp->iov_len) {
 	rs -= vp->iov_len;
-	xmit_free(dp);
+	xmit_free(dp); /* vp->iov_len -= vp->iov_len, etc. */
+	done++;
       } else {
 	vp->iov_base= (char*)vp->iov_base + rs;
 	vp->iov_len -= rs;
+	break; /* rs -= rs */
       }
     }
     int newu= conn->xmitu - done;
@@ -1886,9 +1904,10 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
     if (code!=205 && code!=503) {
       connfail(conn, "peer gave unexpected response to QUIT: %s", sani);
     } else {
-      notice("C%d idle connection closed by us", conn->fd);
-      assert(!conn_busy);
       LIST_REMOVE(conns,conn);
+      notice("C%d (now %d) idle connection closed by us",
+	     conn->fd, conns.count);
+      assert(!conn_busy);
       conn_dispose(conn);
     }
     return OOP_CONTINUE;
@@ -1923,8 +1942,9 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
     if (conn_busy)
       PEERBADMSG("peer timed us out or stopped accepting articles");
 
-    notice("C%d idle connection closed by peer", conn->fd);
     LIST_REMOVE(conns,conn);
+    notice("C%d (now %d) idle connection closed by peer",
+	   conns.count, conn->fd);
     conn_dispose(conn);
     return OOP_CONTINUE;
 
@@ -2112,7 +2132,16 @@ static void *feedfile_got_article(oop_source *lp, oop_read *rd,
 
 static void *tailing_rable_call_time(oop_source *loop, struct timeval tv,
 				     void *user) {
+  /* lifetime of ipf here is OK because destruction will cause
+   * on_cancel which will cancel this callback */
   InputFile *ipf= user;
+
+  if (!ipf->fake_readable) return OOP_CONTINUE;
+
+  /* we just keep calling readable until our caller (oop_rd)
+   * has called try_read, and try_read has found EOF so given EAGAIN */
+  loop->on_time(loop, OOP_TIME_NOW, tailing_rable_call_time, ipf);
+
   return ipf->readable_callback(loop, &ipf->readable,
 				ipf->readable_callback_user);
 }
@@ -2125,9 +2154,10 @@ static void tailing_on_cancel(struct oop_readable *rable) {
   ipf->readable_callback= 0;
 }
 
-static void tailing_queue_readable(InputFile *ipf) {
-  /* lifetime of ipf here is OK because destruction will cause
-   * on_cancel which will cancel this callback */
+static void tailing_make_readable(InputFile *ipf) {
+  if (!ipf || !ipf->readable_callback) /* so callers can be naive */
+    return;
+  ipf->fake_readable= 1;
   loop->on_time(loop, OOP_TIME_NOW, tailing_rable_call_time, ipf);
 }
 
@@ -2139,8 +2169,7 @@ static int tailing_on_readable(struct oop_readable *rable,
   ipf->readable_callback= cb;
   ipf->readable_callback_user= user;
   filemon_start(ipf);
-
-  tailing_queue_readable(ipf);
+  tailing_make_readable(ipf);
   return 0;
 }
 
@@ -2151,11 +2180,13 @@ static ssize_t tailing_try_read(struct oop_readable *rable, void *buffer,
     ssize_t r= read(ipf->fd, buffer, length);
     if (r==-1) {
       if (errno==EINTR) continue;
+      ipf->fake_readable= 0;
       return r;
     }
     if (!r) {
       if (ipf==main_input_file) {
 	errno=EAGAIN;
+	ipf->fake_readable= 0;
 	return -1;
       } else if (ipf==flushing_input_file) {
 	assert(ipf->rd);
@@ -2166,7 +2197,6 @@ static ssize_t tailing_try_read(struct oop_readable *rable, void *buffer,
 	abort();
       }
     }
-    tailing_queue_readable(ipf);
     return r;
   }
 }
@@ -2231,7 +2261,7 @@ static void *filemon_inotify_readable(oop_source *lp, int fd,
     }
     InputFile *ipf= filemon_inotify_wd2ipf[iev.wd];
     /*debug("filemon inotify readable read %p wd=%d", ipf, iev.wd);*/
-    filemon_callback(ipf);
+    tailing_make_readable(ipf);
   }
   return OOP_CONTINUE;
 }
@@ -2292,11 +2322,6 @@ static void filemon_stop(InputFile *ipf) {
   ipf->filemon= 0;
 }
 
-static void filemon_callback(InputFile *ipf) {
-  if (ipf && ipf->readable_callback) /* so filepoll() can be naive */
-    ipf->readable_callback(loop, &ipf->readable, ipf->readable_callback_user);
-}
-
 /*---------- interface to start and stop an input file ----------*/
 
 static const oop_rd_style feedfile_rdstyle= {
@@ -2899,11 +2924,11 @@ static void search_backlog_file(void) {
       preterminate();
       notice("feed dropped and our work is complete");
 
-      int r= unlink(path_control);
+      int r= unlink(path_cli);
       if (r && errno!=ENOENT)
-	syswarn("failed to remove control symlink for old feed");
+	syswarn("failed to unlink cli socket for old feed");
 
-      xunlink(path_lock,    "lockfile for old feed");
+      xunlink(path_lock, "lockfile for old feed");
       exit(4);
     }
     until_backlog_nextscan= backlog_spontrescan_periods;
@@ -3035,7 +3060,7 @@ static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
     case INNDCOMMCHILD_ESTATUS_NONESUCH:
       notice("feed has been dropped by innd, finishing up");
       flushing_input_file= main_input_file;
-      tailing_queue_readable(flushing_input_file);
+      tailing_make_readable(flushing_input_file);
 	/* we probably previously returned EAGAIN from our fake read method
 	 * when in fact we were at EOF, so signal another readable event
 	 * so we actually see the EOF */
@@ -3055,17 +3080,19 @@ static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
     case 0:
       /* as above */
       flushing_input_file= main_input_file;
-      tailing_queue_readable(flushing_input_file);
+      tailing_make_readable(flushing_input_file);
 
       main_input_file= open_input_file(feedfile);
       if (!main_input_file)
-	die("flush succeeded but feedfile %s does not exist!", feedfile);
+	die("flush succeeded but feedfile %s does not exist!"
+	    " (this probably means feedfile does not correspond"
+	    " to site %s in newsfeeds)", feedfile, sitename);
 
       if (flushing_input_file) {
-	SMS(SEPARATED, max_separated_periods, "recovery flush complete");
+	SMS(SEPARATED, max_separated_periods, "flush complete");
       } else {
 	close_defer();
-	SMS(NORMAL, spontaneous_flush_periods, "flush complete");
+	SMS(NORMAL, spontaneous_flush_periods, "recovery flush complete");
       }
       return OOP_CONTINUE;
 
@@ -3204,8 +3231,8 @@ static void every(int interval, int fixed_rate, void (*f)(void)) {
 }
 
 static void filepoll(void) {
-  filemon_callback(main_input_file);
-  filemon_callback(flushing_input_file);
+  tailing_make_readable(main_input_file);
+  tailing_make_readable(flushing_input_file);
 }
 
 static char *debug_report_ipf(InputFile *ipf) {
@@ -3255,7 +3282,7 @@ static void period(void) {
 
 /*========== dumping state ==========*/
 
-static void dump_article_list(FILE *f, const ControlCommand *c,
+static void dump_article_list(FILE *f, const CliCommand *c,
 			      const ArticleList *al) {
   fprintf(f, " count=%d\n", al->count);
   if (!c->xval) return;
@@ -3272,7 +3299,7 @@ static void dump_article_list(FILE *f, const ControlCommand *c,
   }
 }
   
-static void dump_input_file(FILE *f, const ControlCommand *c,
+static void dump_input_file(FILE *f, const CliCommand *c,
 			    InputFile *ipf, const char *wh) {
   char *dipf= debug_report_ipf(ipf);
   fprintf(f,"input %s %s", wh, dipf);
@@ -3323,7 +3350,7 @@ CCMD(dump) {
   fprintf(f,"special");
   DUMPV("%ld", (long),connecting_child);
   DUMPV("%d", , connecting_fdpass_sock);
-  DUMPV("%d", , control_master);
+  DUMPV("%d", , cli_master);
   fprintf(f,"\n");
 
   fprintf(f,"filemon ");
@@ -3367,7 +3394,7 @@ CCMD(dump) {
 
   fprintf(f,"paths");
   DUMPV("%s", , feedfile);
-  DUMPV("%s", , path_control);
+  DUMPV("%s", , path_cli);
   DUMPV("%s", , path_lock);
   DUMPV("%s", , path_flushing);
   DUMPV("%s", , path_defer);
@@ -3554,7 +3581,8 @@ static const Option innduct_options[]= {
 {0,"no-filemon",         0,       &try_filemon,              op_setint, 0   },
 {'C',"inndconf",         "F",     &inndconffile,             op_string      },
 {'P',"port",             "PORT",  &port,                     op_integer     },
-{0,"cli",                0,       &path_control,             op_string      },
+{0,"chdir",              "DIR",   &path_run,                 op_string      },
+{0,"cli",            "DIR/|PATH", &path_cli,                 op_string      },
 {0,"help",               0,       0,                         help           },
 
 {0,"max-connections",    "N",     &max_connections,          op_integer     },
@@ -3604,12 +3632,10 @@ static void convert_to_periods_rndup(int *store) {
   *store /= period_seconds;
 }
 
-static void assemble_path(const char **path_io, const char *suffix,
-			  const char *what) {
-  const char *const specified= *path_io;
-  if (!specified[0]) badusage("%s, if specified, must be nonempty", what);
-  if (specified[strlen(specified)-1]=='/')
-    *path_io= xasprintf("%s%s%s", specified, sitename, suffix);
+static int path_ends_slash(const char *specified) {
+  int l= strlen(specified);
+  assert(l);
+  return specified[l-1] == '/';
 }
 
 int main(int argc, char **argv) {
@@ -3624,7 +3650,10 @@ int main(int argc, char **argv) {
 
   sitename= *argv++;
   if (!sitename) badusage("need site name argument");
-  remote_host= *argv++;
+
+  if (*argv) remote_host= *argv++;
+  else remote_host= sitename;
+  
   if (*argv) badusage("too many non-option arguments");
 
   /* defaults */
@@ -3653,12 +3682,26 @@ int main(int argc, char **argv) {
   if (max_bad_data_ratio < 0 || max_bad_data_ratio > 100)
     badusage("bad input data ratio must be between 0..100");
   max_bad_data_ratio *= 0.01;
-  
-  if (!feedfile) feedfile= xasprintf("%s/%s",innconf->pathoutgoing,sitename);
-  else assemble_path(&feedfile, "", "feed filename");
 
-  if (path_control) path_control= xasprintf("%s_cli", feedfile);
-  else assemble_path(&path_control, "%s_cli", "control socket path");
+  if (!path_run)
+    path_run= innconf->pathrun;
+
+  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);
+  if (feedfile[0] != '/')
+    feedfile= xasprintf("%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);
+  }
+  if (path_cli_dir)
+    path_cli= xasprintf("%s/%s", path_cli_dir, sitename);
 
   if (max_queue_per_ipf<0)
     max_queue_per_ipf= max_queue_per_conn * 2;
@@ -3701,7 +3744,7 @@ int main(int argc, char **argv) {
     if (child1) _exit(0);
 
     pid_t sid= setsid();
-    if (sid != child1) sysfatal("setsid failed");
+    if (sid == -1) sysfatal("setsid failed");
 
     pid_t child2= xfork("daemonise second fork");
     if (child2) _exit(0);
@@ -3710,6 +3753,9 @@ int main(int argc, char **argv) {
   self_pid= getpid();
   if (self_pid==-1) sysdie("getpid");
 
+  r= chdir(path_run);
+  if (r) sysdie("could not chdir to pathrun %s", path_run);
+
   statemc_lock();
 
   init_signals();
@@ -3718,12 +3764,12 @@ int main(int argc, char **argv) {
 
   int val= 1;
   r= SMsetup(SM_PREOPEN, &val); if (!r) warn("SMsetup SM_PREOPEN failed");
-//  r= SMinit(); if (!r) die("storage manager initialisation (SMinit) failed");
+  r= SMinit(); if (!r) die("storage manager initialisation (SMinit) failed");
 
   if (!become_daemon)
-    control_stdio();
+    cli_stdio();
 
-  control_init();
+  cli_init();
 
   int filemon_ok= 0;
   if (!try_filemon) {