From be42afab1c325fae5c3c270876a3447220adcca5 Mon Sep 17 00:00:00 2001
From: james <>
Date: Fri, 7 Mar 2008 13:16:02 +0000
Subject: *** empty log message ***

---
 apps/sympathy.c | 749 +++++++++++++++++++++++++-------------------------------
 1 file changed, 340 insertions(+), 409 deletions(-)

(limited to 'apps/sympathy.c')

diff --git a/apps/sympathy.c b/apps/sympathy.c
index 357f1df..bb141b1 100644
--- a/apps/sympathy.c
+++ b/apps/sympathy.c
@@ -1,4 +1,4 @@
-/*
+/* 
  * sympathy.c:
  *
  * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
@@ -9,8 +9,11 @@
 static char rcsid[] =
   "$Id$";
 
-/*
+/* 
  * $Log$
+ * Revision 1.37  2008/03/07 13:16:02  james
+ * *** empty log message ***
+ *
  * Revision 1.36  2008/03/06 21:34:09  james
  * *** empty log message ***
  *
@@ -182,7 +185,7 @@ sigchld (int dummy)
   wait3 (&status, WNOHANG, NULL);
 }
 
-/*Dispell zombies, from for example log compression*/
+/* Dispell zombies, from for example log compression */
 void
 garlic (void)
 {
@@ -204,26 +207,25 @@ teedious_snprintf (char *fmt, va_list ap)
   if (!buf)
     fatal_moan ("malloc failed");
 
-  while (1)
-    {
+  while (1) {
 
-      va_copy (aq, ap);
-      n = vsnprintf (buf, size, fmt, aq);
-      va_end (aq);
+    va_copy (aq, ap);
+    n = vsnprintf (buf, size, fmt, aq);
+    va_end (aq);
 
-      if (n > -1 && n < (size))
-        return buf;
+    if (n > -1 && n < (size))
+      return buf;
 
-      if (n > -1)               /* glibc 2.1 */
-        size = n + 1;
-      else                      /* glibc 2.0 */
-        size *= 2;              /* twice the old size */
+    if (n > -1)                 /* glibc 2.1 */
+      size = n + 1;
+    else                        /* glibc 2.0 */
+      size *= 2;                /* twice the old size */
 
-      buf = realloc (buf, size);
+    buf = realloc (buf, size);
 
-      if (!buf)
-        fatal_moan ("malloc failed");
-    }
+    if (!buf)
+      fatal_moan ("malloc failed");
+  }
 
 }
 
@@ -236,7 +238,7 @@ gloo_paths (char *dir, char *leaf)
     dir = "";
   if (!leaf)
     leaf = "";
-  ret = ptr = malloc (strlen (dir) + strlen (leaf) + 2);
+  ret = ptr = xmalloc (strlen (dir) + strlen (leaf) + 2);
 
   while (*dir)
     *(ptr++) = *(dir++);
@@ -249,7 +251,7 @@ gloo_paths (char *dir, char *leaf)
 }
 
 
-/*make the path in fmt from home (hence the name) */
+/* make the path in fmt from home (hence the name) */
 char *
 mome (char *fmt, ...)
 {
@@ -261,16 +263,13 @@ mome (char *fmt, ...)
   if (!home)
     return NULL;
 
-  if (fmt)
-    {
-      va_start (ap, fmt);
-      leaf = teedious_snprintf (fmt, ap);
-      va_end (ap);
-    }
-  else
-    {
-      leaf = NULL;
-    }
+  if (fmt) {
+    va_start (ap, fmt);
+    leaf = teedious_snprintf (fmt, ap);
+    va_end (ap);
+  } else {
+    leaf = NULL;
+  }
 
   ret = gloo_paths (home, leaf);
   if (leaf)
@@ -289,56 +288,45 @@ find_socket (char **retpath, char *fmt, ...)
   va_list ap;
 
 
-  if (fmt)
-    {
-      va_start (ap, fmt);
-      leaf = teedious_snprintf (fmt, ap);
-      va_end (ap);
-    }
-  else
-    {
-      leaf = NULL;
-    }
-
+  if (fmt) {
+    va_start (ap, fmt);
+    leaf = teedious_snprintf (fmt, ap);
+    va_end (ap);
+  } else {
+    leaf = NULL;
+  }
 
-  for (ptr = socket_dirs; *ptr; ptr++)
-    {
-      if (**ptr == '~')
-        {
-          h = mome (*ptr + 1);
-        }
-      else
-        {
-          h = *ptr;
-        }
 
-      if (!h)
-        continue;
+  for (ptr = socket_dirs; *ptr; ptr++) {
+    if (**ptr == '~') {
+      h = mome (*ptr + 1);
+    } else {
+      h = *ptr;
+    }
 
+    if (!h)
+      continue;
 
-      path = gloo_paths (h, leaf);
-      if (**ptr == '~')
-        free (h);
 
-      ret = socket_connect (path);
+    path = gloo_paths (h, leaf);
+    if (**ptr == '~')
+      free (h);
 
+    ret = socket_connect (path);
 
-      if (ret)
-        {
-          if (retpath)
-            {
-              *retpath = path;
-            }
-          else
-            {
-              free (path);
-            }
-          free (leaf);
-          return ret;
-        }
-      free (path);
 
+    if (ret) {
+      if (retpath) {
+        *retpath = path;
+      } else {
+        free (path);
+      }
+      free (leaf);
+      return ret;
     }
+    free (path);
+
+  }
 
   free (leaf);
   return NULL;
@@ -366,38 +354,30 @@ list_sockets_in_dir (char *sockdir)
   rewinddir (dir);
 
 
-  while ((ent = readdir (dir)))
-    {
-      sn = gloo_paths (sockdir, ent->d_name);
-      if (stat (sn, &buf) || (!S_ISSOCK (buf.st_mode)))
-        {
-          free (sn);
-          continue;
-        }
-
-      s = socket_connect (sn);
-
-      if (s)
-        {
-          printf ("\t%s 	(Active)\n", sn);
-          socket_free (s);
-        }
-      else
-        {
-          if (strncmp (ent->d_name, hostname, hostname_len))
-            {
-              printf ("\t%s	(Unknown - not this host)\n", sn);
-            }
-          else
-            {
-              printf ("\t%s	(Dead, wiped)\n", sn);
-              unlink (sn);
-            }
-        }
-
+  while ((ent = readdir (dir))) {
+    sn = gloo_paths (sockdir, ent->d_name);
+    if (stat (sn, &buf) || (!S_ISSOCK (buf.st_mode))) {
       free (sn);
+      continue;
     }
 
+    s = socket_connect (sn);
+
+    if (s) {
+      printf ("\t%s 	(Active)\n", sn);
+      socket_free (s);
+    } else {
+      if (strncmp (ent->d_name, hostname, hostname_len)) {
+        printf ("\t%s	(Unknown - not this host)\n", sn);
+      } else {
+        printf ("\t%s	(Dead, wiped)\n", sn);
+        unlink (sn);
+      }
+    }
+
+    free (sn);
+  }
+
   closedir (dir);
 
   return 0;
@@ -409,26 +389,22 @@ list_sockets (void)
   char **ptr, *h;
 
 
-  for (ptr = socket_dirs; *ptr; ptr++)
-    {
-      if (**ptr == '~')
-        {
-          h = mome (*ptr + 1);
-        }
-      else
-        {
-          h = *ptr;
-        }
+  for (ptr = socket_dirs; *ptr; ptr++) {
+    if (**ptr == '~') {
+      h = mome (*ptr + 1);
+    } else {
+      h = *ptr;
+    }
 
-      if (!h)
-        continue;
+    if (!h)
+      continue;
 
-      list_sockets_in_dir (h);
+    list_sockets_in_dir (h);
 
-      if (**ptr == '~')
-        free (h);
+    if (**ptr == '~')
+      free (h);
 
-    }
+  }
 
   return 0;
 }
@@ -439,11 +415,10 @@ get_hostname (void)
 {
   struct utsname name;
 
-  if (uname (&name))
-    {
-      strcpy (hostname, "unknown.");
-      return;
-    }
+  if (uname (&name)) {
+    strcpy (hostname, "unknown.");
+    return;
+  }
 
 
   strcpy (hostname, name.nodename);
@@ -479,35 +454,28 @@ main (int argc, char *argv[])
 
   memset (oflags, 0, sizeof (oflags));
   memset (oargs, 0, sizeof (oargs));
-  while ((c = getopt (argc, argv, "I:NRP:vw:utscr:lKHd:pb:fL:Fk:n:")) != EOF)
-    {
-      switch (c)
-        {
-        case ':':
-        case 'h':
-        case '?':
-          usage ();
-        default:
-          if ((c > 64) && (c < 91))
-            {
-              oflags[c]++;
-              oargs[c] = optarg;
-            }
-          else if ((c > 96) && (c < 123))
-            {
-              oflags[c]++;
-              oargs[c] = optarg;
-            }
-          else
-            {
-              fprintf (stderr, "unknown option %c\n", c);
-              usage ();
-            }
-        }
-
+  while ((c = getopt (argc, argv, "I:NRP:vw:utscr:lKHd:pb:fL:Fk:n:")) != EOF) {
+    switch (c) {
+    case ':':
+    case 'h':
+    case '?':
+      usage ();
+    default:
+      if ((c > 64) && (c < 91)) {
+        oflags[c]++;
+        oargs[c] = optarg;
+      } else if ((c > 96) && (c < 123)) {
+        oflags[c]++;
+        oargs[c] = optarg;
+      } else {
+        fprintf (stderr, "unknown option %c\n", c);
+        usage ();
+      }
     }
 
-  /*Compatability for screen's ls */
+  }
+
+  /* Compatability for screen's ls */
   if (oflags['l'])
     oflags['s'] = 0;
 
@@ -520,25 +488,23 @@ main (int argc, char *argv[])
     sum += oflags['l'];
     sum += oflags['v'];
 
-    if (!sum)
-      {
-        /*If no mode is specified behave like screen */
-        oflags['s']++;
-        oflags['c']++;
-        sum++;
-      }
+    if (!sum) {
+      /* If no mode is specified behave like screen */
+      oflags['s']++;
+      oflags['c']++;
+      sum++;
+    }
 
     if (sum != 1)
       fatal_moan
         ("specifiy exactly one of ( -c and or -s ), -t, -r, -l and -v");
   }
 
-  if (oflags['v'])
-    {
-      fprintf (stderr, "Version: %s\n", libsympathy_version ());
-      fprintf (stderr, "Version: %s\n", rcsid);
-      return 0;
-    }
+  if (oflags['v']) {
+    fprintf (stderr, "Version: %s\n", libsympathy_version ());
+    fprintf (stderr, "Version: %s\n", rcsid);
+    return 0;
+  }
 
   if (oflags['l'])
     return list_sockets ();
@@ -548,17 +514,16 @@ main (int argc, char *argv[])
     fatal_moan ("-k is incompatible with -r");
 
 
-  if (oflags['n'])
-    {
-      history = safe_atoi (oargs['n']);
-      if (history < 0)
-        fatal_moan ("cannot parse -n %s as an integer", oargs['n']);
+  if (oflags['n']) {
+    history = safe_atoi (oargs['n']);
+    if (history < 0)
+      fatal_moan ("cannot parse -n %s as an integer", oargs['n']);
 
-      if (!history)
-        fatal_moan ("agrument to -n must be greater than zero");
-    }
+    if (!history)
+      fatal_moan ("agrument to -n must be greater than zero");
+  }
 
-  /*Fold -r implies -c */
+  /* Fold -r implies -c */
   if (oflags['r'])
     oflags['c']++;
 
@@ -572,68 +537,64 @@ main (int argc, char *argv[])
   if (oflags['H'] && oflags['N'])
     fatal_moan ("-H is incompatible with -N");
 
-  /*implement server and client: this process forks. The parent */
-  /*becomes the client and the child forks again to become the */
-  /*server. If there's no -k argument the client (parent) needs */
-  /*to find out the pid of the server, we use a pipe */
-
-  if (oflags['s'] && oflags['c'])
-    {
-      if (!oflags['k'])
-        {
-          csnok++;
-          pipe (csnok_pipe);
-        }
-
-      switch (pid = fork ())
-        {
-        case 0:                /*child becomes the server */
-          oflags['c'] = 0;
-          oflags['H'] = 0;
-          oflags['N'] = 0;
-          oflags['I'] = 0;
-
-          if (csnok)
-            close (csnok_pipe[0]);
-          break;
-        case -1:
-          fatal_moan ("fork failed");
-        default:               /*parent becomes client */
-          oflags['s'] = 0;
-          oflags['K'] = 0;
-          oflags['d'] = 0;
-          oflags['p'] = 0;
-          oflags['b'] = 0;
-          oflags['f'] = 0;
-          oflags['L'] = 0;
-          oflags['R'] = 0;
-          oflags['P'] = 0;
-          oflags['n'] = 0;
-          oflags['w'] = 0;
-
-          /*Collect the child */
-          waitpid (pid, NULL, 0);
-
-          /*if there was no k argument we need to find the */
-          /*pid of the server process so that we can work out */
-          /*what the socket is called. The server tells us on */
-          /*a pipe */
-
-          if (csnok)
-            {
-              close (csnok_pipe[1]);
-
-              if (read (csnok_pipe[0], &pid, sizeof (pid)) != sizeof (pid))
-                fatal_moan ("Failed to receive pid of server process");
-
-              close (csnok_pipe[0]);
-
-              oargs['k'] = mome ("/.sympathy/%s%d", hostname, pid);
-              oflags['k']++;
-            }
-        }
+  /* implement server and client: this process forks. The parent */
+  /* becomes the client and the child forks again to become the */
+  /* server. If there's no -k argument the client (parent) needs */
+  /* to find out the pid of the server, we use a pipe */
+
+  if (oflags['s'] && oflags['c']) {
+    if (!oflags['k']) {
+      csnok++;
+      pipe (csnok_pipe);
     }
 
+    switch (pid = fork ()) {
+    case 0:                    /* child becomes the server */
+      oflags['c'] = 0;
+      oflags['H'] = 0;
+      oflags['N'] = 0;
+      oflags['I'] = 0;
+
+      if (csnok)
+        close (csnok_pipe[0]);
+      break;
+    case -1:
+      fatal_moan ("fork failed");
+    default:                   /* parent becomes client */
+      oflags['s'] = 0;
+      oflags['K'] = 0;
+      oflags['d'] = 0;
+      oflags['p'] = 0;
+      oflags['b'] = 0;
+      oflags['f'] = 0;
+      oflags['L'] = 0;
+      oflags['R'] = 0;
+      oflags['P'] = 0;
+      oflags['n'] = 0;
+      oflags['w'] = 0;
+
+      /* Collect the child */
+      waitpid (pid, NULL, 0);
+
+      /* if there was no k argument we need to find the */
+      /* pid of the server process so that we can work out */
+      /* what the socket is called. The server tells us on */
+      /* a pipe */
+
+      if (csnok) {
+        close (csnok_pipe[1]);
+
+        if (read (csnok_pipe[0], &pid, sizeof (pid)) != sizeof (pid))
+          fatal_moan ("Failed to receive pid of server process");
+
+        close (csnok_pipe[0]);
+
+        oargs['k'] = mome ("/.sympathy/%s%d", hostname, pid);
+        oflags['k']++;
+      }
+    }
+  }
+
 
   if (oflags['c'] && !oflags['k'] && !oflags['r'])
     fatal_moan ("-c requires a socket to be specified with -s or -k or -r");
@@ -646,223 +607,193 @@ main (int argc, char *argv[])
     fatal_moan
       ("-c or -r are incompatible with -p, -d, -K, -b, -f, -R, -P or -L");
 
-  if (oflags['t'] || oflags['s'])
-    {
-      if (!oflags['p'] && !oflags['d'])
-        oflags['p']++;
+  if (oflags['t'] || oflags['s']) {
+    if (!oflags['p'] && !oflags['d'])
+      oflags['p']++;
+  }
+
+  if (oflags['w']) {
+    char buf[128], *ptr;
+    strcpy (buf, oargs['w']);
+    ptr = index (buf, 'x');
+    if (ptr) {
+      *ptr = 0;
+      ptr++;
+      size.y = safe_atoi (ptr);
     }
+    size.x = safe_atoi (buf);
 
-  if (oflags['w'])
-    {
-      char buf[128], *ptr;
-      strcpy (buf, oargs['w']);
-      ptr = index (buf, 'x');
-      if (ptr)
-        {
-          *ptr = 0;
-          ptr++;
-          size.y = safe_atoi (ptr);
-        }
-      size.x = safe_atoi (buf);
-
-      if ((size.x > VT102_MAX_COLS) || (size.x < 1))
-        fatal_moan ("-w requires a width between 1 and %d\n", VT102_MAX_COLS);
-
-      if ((size.y > VT102_MAX_ROWS) || (size.y < 1))
-        fatal_moan ("-w requires a height between 1 and %d\n",
-                    VT102_MAX_ROWS);
+    if ((size.x > VT102_MAX_COLS) || (size.x < 1))
+      fatal_moan ("-w requires a width between 1 and %d\n", VT102_MAX_COLS);
 
-    }
+    if ((size.y > VT102_MAX_ROWS) || (size.y < 1))
+      fatal_moan ("-w requires a height between 1 and %d\n", VT102_MAX_ROWS);
 
-  if (oflags['s'] && !oflags['F'])
-    {
-      /*nochdir incase socket is relative path, unlink then will fail */
-      daemon (1, 0);
+  }
 
-    }
+  if (oflags['s'] && !oflags['F']) {
+    /* nochdir incase socket is relative path, unlink then will fail */
+    daemon (1, 0);
+
+  }
 
 
-  if (oflags['s'])
-    {
-      char *path;
-      path = mome ("/.sympathy");
-      mkdir (path, 0700);
-      free (path);
+  if (oflags['s']) {
+    char *path;
+    path = mome ("/.sympathy");
+    mkdir (path, 0700);
+    free (path);
 
 
-      if (!oflags['k'])
-        {
-          pid = getpid ();
+    if (!oflags['k']) {
+      pid = getpid ();
 
-          oargs['k'] = mome ("/.sympathy/%s%d", hostname, pid);
-          oflags['k']++;
-        }
+      oargs['k'] = mome ("/.sympathy/%s%d", hostname, pid);
+      oflags['k']++;
+    }
 
-      server_socket = socket_listen (oargs['k']);
+    server_socket = socket_listen (oargs['k']);
 
-      /*Tell our parent's parent what our pid is */
-      if (csnok)
-        {
-          pid = getpid ();
+    /* Tell our parent's parent what our pid is */
+    if (csnok) {
+      pid = getpid ();
+
+      write (csnok_pipe[1], &pid, sizeof (pid));
+      close (csnok_pipe[1]);
+    }
 
-          write (csnok_pipe[1], &pid, sizeof (pid));
-          close (csnok_pipe[1]);
-        }
+    if (!server_socket)
+      fatal_moan ("failed to create socket %s for listening", oargs['k']);
 
-      if (!server_socket)
-        fatal_moan ("failed to create socket %s for listening", oargs['k']);
+  }
 
+  if (oflags['s'] || oflags['t']) {
+    if (oflags['P']) {
+      FILE *fp;
+      pid_file = oargs['P'];
+      fp = fopen (pid_file, "w");
+      if (fp) {
+        fprintf (fp, "%d", getpid ());
+        fclose (fp);
+      }
     }
 
-  if (oflags['s'] || oflags['t'])
-    {
-      if (oflags['P'])
-        {
-          FILE *fp;
-          pid_file = oargs['P'];
-          fp = fopen (pid_file, "w");
-          if (fp)
-            {
-              fprintf (fp, "%d", getpid ());
-              fclose (fp);
-            }
-        }
-
-      if (oflags['L'])
-        {
-          ctx->l = file_log_new (oargs['L'], oflags['R']);
-          if (!ctx->l)
-            fatal_moan ("unable to access log file %s", oargs['L']);
-        }
-
-      if (oflags['p'])
-        {
-          ctx->t = ptty_open (NULL, NULL, &size);
-          if (!ctx->t)
-            fatal_moan ("unable to open a ptty");
-        }
-      else
-        {
-          /*HACK-- check that console=device does not occur in */
-          /*/proc/cmdline */
-          if (!oargs['d'])
-            fatal_moan ("no argument to -d");
-
-          {
-            char kernel_cmdline[4096] = { 0 };
-            char search_string[1024] = "console=";
-            char *ptr = oargs['d'];
-            int fd;
-
-            if (!strncmp ("/dev/", ptr, 5))
-              ptr += 5;
-
-            strcat (search_string, ptr);
-
-            fd = open ("/proc/cmdline", O_RDONLY);
-            read (fd, kernel_cmdline, sizeof (kernel_cmdline));
-            close (fd);
-
-            kernel_cmdline[sizeof (kernel_cmdline) - 1] = 0;
-
-            if (strstr (kernel_cmdline, search_string))
-              fatal_moan ("/proc/cmdline contains %s", search_string);
-          }
-
-          ctx->t =
-            serial_open (oargs['d'],
-                         oflags['K'] ? SERIAL_LOCK_ACTIVE :
-                         SERIAL_LOCK_PASSIVE);
-          if (!ctx->t)
-            fatal_moan ("unable to open serial port %s", oargs['d']);
-        }
-
-      if (oflags['b'])
-        {
-          int baud = safe_atoi (oargs['b']);
-
-          if (baud < 0)
-            fatal_moan ("Unable to parse baudrate %s", oargs['b']);
-
-          tty_set_baud (ctx->t, baud);
-
-        }
-
-      tty_set_flow (ctx->t, oflags['f'] ? 1 : 0);
+    if (oflags['L']) {
+      ctx->l = file_log_new (oargs['L'], oflags['R']);
+      if (!ctx->l)
+        fatal_moan ("unable to access log file %s", oargs['L']);
     }
 
+    if (oflags['p']) {
+      ctx->t = ptty_open (NULL, NULL, &size);
+      if (!ctx->t)
+        fatal_moan ("unable to open a ptty");
+    } else {
+      /* HACK-- check that console=device does not occur in */
+      /* /proc/cmdline */
+      if (!oargs['d'])
+        fatal_moan ("no argument to -d");
 
-  if (oflags['r'])
-    {
-      char *id = oargs['r'];
+      {
+        char kernel_cmdline[4096] = { 0 };
+        char search_string[1024] = "console=";
+        char *ptr = oargs['d'];
+        int fd;
+
+        if (!strncmp ("/dev/", ptr, 5))
+          ptr += 5;
 
-      if (!id)
-        fatal_moan ("-r requires an argument");
+        strcat (search_string, ptr);
 
-      if (safe_atoi (id) > 0)
-        {
-          client_socket =
-            find_socket (&oargs['k'], "%s%d", hostname, safe_atoi (id));
-        }
-      else
-        {
-          client_socket = find_socket (&oargs['k'], "%s", id);
-        }
+        fd = open ("/proc/cmdline", O_RDONLY);
+        read (fd, kernel_cmdline, sizeof (kernel_cmdline));
+        close (fd);
 
-      if (!client_socket)
-        fatal_moan ("failed to find socket %s", oargs['r']);
+        kernel_cmdline[sizeof (kernel_cmdline) - 1] = 0;
+
+        if (strstr (kernel_cmdline, search_string))
+          fatal_moan ("/proc/cmdline contains %s", search_string);
+      }
+
+      ctx->t =
+        serial_open (oargs['d'],
+                     oflags['K'] ? SERIAL_LOCK_ACTIVE : SERIAL_LOCK_PASSIVE);
+      if (!ctx->t)
+        fatal_moan ("unable to open serial port %s", oargs['d']);
+    }
+
+    if (oflags['b']) {
+      int baud = safe_atoi (oargs['b']);
+
+      if (baud < 0)
+        fatal_moan ("Unable to parse baudrate %s", oargs['b']);
+
+      tty_set_baud (ctx->t, baud);
 
     }
-  else if (oflags['c'])
-    {
-      client_socket = socket_connect (oargs['k']);
 
-      if (!client_socket)
-        fatal_moan ("failed to connect to socket %s", oargs['k']);
+    tty_set_flow (ctx->t, oflags['f'] ? 1 : 0);
+  }
+
+
+  if (oflags['r']) {
+    char *id = oargs['r'];
 
+    if (!id)
+      fatal_moan ("-r requires an argument");
+
+    if (safe_atoi (id) > 0) {
+      client_socket =
+        find_socket (&oargs['k'], "%s%d", hostname, safe_atoi (id));
+    } else {
+      client_socket = find_socket (&oargs['k'], "%s", id);
     }
 
+    if (!client_socket)
+      fatal_moan ("failed to find socket %s", oargs['r']);
+
+  } else if (oflags['c']) {
+    client_socket = socket_connect (oargs['k']);
+
+    if (!client_socket)
+      fatal_moan ("failed to connect to socket %s", oargs['k']);
+
+  }
 
-  if (oflags['c'] || oflags['t'])
-    {
-      if (oflags['N'])
-        {
-          ctx->r = rx_new_raw (0, 1);
-          ansi = ansi_new_raw (0, 1);
-        }
-      else if (oflags['H'])
-        {
-          ansi = ansi_new_html (stdout);
-        }
-      else
-        {
-          terminal_register_handlers ();
-          ansi =
-            ansi_new_from_terminal (terminal_open (0, 1),
-                                    oflags['u'] ? 0 : 1);
-          ansi->reset (ansi, NULL);
-          if (ansi->set_title)
-            ansi->set_title (ansi, oargs['k']);
-        }
-      if (oflags['I'])
-        {
-          //FIXME ...
-        }
+    if (oflags['I']) {
+      // FIXME ...
+
+    } else { 
+	if (client_socket)
+		ipc_msg_send_initialize(client_socket);
+
+  if (oflags['c'] || oflags['t']) {
+    if (oflags['N']) {
+      ctx->r = rx_new_raw (0, 1);
+      ansi = ansi_new_raw (0, 1);
+    } else if (oflags['H']) {
+      ansi = ansi_new_html (stdout);
+    } else {
+      terminal_register_handlers ();
+      ansi =
+        ansi_new_from_terminal (terminal_open (0, 1), oflags['u'] ? 0 : 1);
+      ansi->reset (ansi, NULL);
+      if (ansi->set_title)
+        ansi->set_title (ansi, oargs['k']);
     }
+  }
 
 
   ctx->v = vt102_new (&size);
   ctx->h = history_new (history);
 
   mainloop (ctx, ansi, server_socket, client_socket);
+  }
 
-//  mainloop (tty, server_socket, client_socket, ansi, log, history, &size);
-
-  if (ansi)
-    {
-      ansi->close (ansi);
-      terminal_atexit ();
-    }
+  if (ansi) {
+    ansi->close (ansi);
+    terminal_atexit ();
+  }
 
   if (ctx->t)
     ctx->t->close (ctx->t);
-- 
cgit v1.2.3