From 6a4255cf4a29954108907716e9e69c72f041d5da Mon Sep 17 00:00:00 2001 From: james <> Date: Fri, 9 May 2008 12:35:57 +0000 Subject: *** empty log message *** --- apps/sympathy.c | 799 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 453 insertions(+), 346 deletions(-) (limited to 'apps/sympathy.c') diff --git a/apps/sympathy.c b/apps/sympathy.c index c85bdae..776ae4f 100644 --- a/apps/sympathy.c +++ b/apps/sympathy.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.48 2008/05/09 12:35:57 james + * *** empty log message *** + * * Revision 1.47 2008/05/09 12:26:58 staffcvs * *** empty log message *** * @@ -172,7 +175,7 @@ static char rcsid[] = #include "mainloop.h" -int use_syslog=0; +int use_syslog = 0; extern void usage (void); extern char *expand (const char *, int *); @@ -205,10 +208,18 @@ fatal_moan (char *fmt, ...) va_start (ap, fmt); - vfprintf (stderr, fmt, ap); + + if (use_syslog) + { + vsyslog (LOG_ERR, fmt, ap); + } + else + { + vfprintf (stderr, fmt, ap); + putc ('\n', stderr); + } va_end (ap); - putc ('\n', stderr); exit (1); } @@ -241,25 +252,26 @@ 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"); + } } @@ -297,13 +309,16 @@ 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) @@ -322,45 +337,56 @@ 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; - } + for (ptr = socket_dirs; *ptr; ptr++) + { + if (**ptr == '~') + { + h = mome (*ptr + 1); + } + else + { + h = *ptr; + } - if (!h) - continue; + if (!h) + continue; - path = gloo_paths (h, leaf); - if (**ptr == '~') - free (h); + path = gloo_paths (h, leaf); + if (**ptr == '~') + free (h); - ret = socket_connect (path); + 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; @@ -388,29 +414,37 @@ 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; - } + 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); - } - } + s = socket_connect (sn); - free (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); @@ -423,22 +457,26 @@ 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; } @@ -448,10 +486,11 @@ get_hostname (void) { struct utsname name; - if (uname (&name)) { - strcpy (hostname, "unknown."); - return; - } + if (uname (&name)) + { + strcpy (hostname, "unknown."); + return; + } strcpy (hostname, name.nodename); @@ -468,10 +507,11 @@ send_to_server (Socket * c, char *s) if (!n) return; - while (n--) { - ipc_msg_send_key (c, *(uint8_t *) s); - s++; - } + while (n--) + { + ipc_msg_send_key (c, *(uint8_t *) s); + s++; + } ipc_msg_send_killme (c); } @@ -504,26 +544,45 @@ main (int argc, char *argv[]) memset (oflags, 0, sizeof (oflags)); memset (oargs, 0, sizeof (oargs)); - while ((c = getopt (argc, argv, "I:NCRP:vw:utscr:lKHd:pb:fL:Fk:n:")) != EOF) { - switch (c) { - case ':': - case 'h': - case '?': - usage (); - default: - if ((c >= 'A') && (c <= 'Z')) { - oflags[c]++; - oargs[c] = optarg; - } else if ((c >= 'a') && (c <= 'z')) { - oflags[c]++; - oargs[c] = optarg; - } else { - fprintf (stderr, "unknown option %c\n", c); - usage (); - } + while ((c = getopt (argc, argv, "I:NCRP:vw:utscr:lKHd:pb:fL:Fk:n:")) != EOF) + { + switch (c) + { + case ':': + case 'h': + case '?': + usage (); + case 'S': + use_syslog++; + openlog ("sympathy", LOG_PID | LOG_CONSOLE, LOG_DAEMON); + /*fall through */ + default: + if ((c >= 'A') && (c <= 'Z')) + { + oflags[c]++; + oargs[c] = optarg; + } + else if ((c >= 'a') && (c <= 'z')) + { + oflags[c]++; + oargs[c] = optarg; + } + else + { + if (use_syslog) + { + syslog (LOG_ERR, "unknown option %c\n", c); + } + else + { + fprintf (stderr, "unknown option %c\n", c); + } + usage (); + } + } + } - } /* Compatability for screen's ls */ if (oflags['l']) @@ -539,23 +598,25 @@ main (int argc, char *argv[]) sum += oflags['v']; sum += oflags['C']; - 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, -C, -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 (); @@ -565,14 +626,15 @@ 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 */ if (oflags['r']) @@ -593,57 +655,60 @@ main (int argc, char *argv[]) /* 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']) { - cs++; - pipe (cs_pipe); - - switch (pid = fork ()) { - case 0: /* child becomes the server */ - oflags['c'] = 0; - oflags['H'] = 0; - oflags['N'] = 0; - oflags['I'] = 0; - - close (cs_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. We do this even if k is specified to avoid */ - /* a race, the server writes to the pipe when the socket */ - /* is opened */ - - close (cs_pipe[1]); - - if (read (cs_pipe[0], &pid, sizeof (pid)) != sizeof (pid)) - fatal_moan ("Failed to receive pid of server process"); - - close (cs_pipe[0]); - - if (!oflags['k']) { - oargs['k'] = mome ("/.sympathy/%s%d", hostname, pid); - oflags['k']++; - } + if (oflags['s'] && oflags['c']) + { + cs++; + pipe (cs_pipe); + + switch (pid = fork ()) + { + case 0: /* child becomes the server */ + oflags['c'] = 0; + oflags['H'] = 0; + oflags['N'] = 0; + oflags['I'] = 0; + + close (cs_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. We do this even if k is specified to avoid */ + /* a race, the server writes to the pipe when the socket */ + /* is opened */ + + close (cs_pipe[1]); + + if (read (cs_pipe[0], &pid, sizeof (pid)) != sizeof (pid)) + fatal_moan ("Failed to receive pid of server process"); + + close (cs_pipe[0]); + + if (!oflags['k']) + { + oargs['k'] = mome ("/.sympathy/%s%d", hostname, pid); + oflags['k']++; + } + } } - } @@ -658,219 +723,261 @@ main (int argc, char *argv[]) fatal_moan ("-c or -r are incompatible with -p, -d, -K, -b, -f, -R, -P or -L"); - if (oflags['C'] || !oflags['d']) - fatal_moan("-C requires -d"); + if (oflags['C'] || !oflags['d']) + fatal_moan ("-C requires -d"); - 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); + if (oflags['t'] || oflags['s']) + { + if (!oflags['p'] && !oflags['d']) + oflags['p']++; } - 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 (oflags['s'] && !oflags['F']) { - /* nochdir incase socket is relative path, unlink then will fail */ - daemon (1, 0); - - } - garlic (); - - if (oflags['s']) { - char *path; - path = mome ("/.sympathy"); - mkdir (path, 0700); - free (path); + 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 (!oflags['k']) { - pid = getpid (); + if ((size.y > VT102_MAX_ROWS) || (size.y < 1)) + fatal_moan ("-w requires a height between 1 and %d\n", + VT102_MAX_ROWS); - oargs['k'] = mome ("/.sympathy/%s%d", hostname, pid); - oflags['k']++; } - server_socket = socket_listen (oargs['k']); - - /* Tell our parent's parent what our pid is */ - /* and that we've opened the server socket */ - if (cs) { - pid = getpid (); + if (oflags['s'] && !oflags['F']) + { + /* nochdir incase socket is relative path, unlink then will fail */ + daemon (1, 0); - write (cs_pipe[1], &pid, sizeof (pid)); - close (cs_pipe[1]); } - if (!server_socket) - fatal_moan ("failed to create socket %s for listening", oargs['k']); + garlic (); - } + if (oflags['s']) + { + char *path; + path = mome ("/.sympathy"); + mkdir (path, 0700); + free (path); - if (oflags['s'] || oflags['t'] || oflags['C']) { - 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['k']) + { + pid = getpid (); - if (oflags['p']) { - if (optind < argc) { - ctx->t = ptty_open (argv[optind], &argv[optind], &size); - } else { - ctx->t = ptty_open (NULL, NULL, &size); - } + oargs['k'] = mome ("/.sympathy/%s%d", hostname, pid); + oflags['k']++; + } - 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"); + server_socket = socket_listen (oargs['k']); - { - char kernel_cmdline[4096] = { 0 }; - char search_string[1024] = "console="; - char *ptr = oargs['d']; - int fd; + /* Tell our parent's parent what our pid is */ + /* and that we've opened the server socket */ + if (cs) + { + pid = getpid (); - if (!strncmp ("/dev/", ptr, 5)) - ptr += 5; + write (cs_pipe[1], &pid, sizeof (pid)); + close (cs_pipe[1]); + } - strcat (search_string, ptr); + if (!server_socket) + fatal_moan ("failed to create socket %s for listening", oargs['k']); - fd = open ("/proc/cmdline", O_RDONLY); - read (fd, kernel_cmdline, sizeof (kernel_cmdline)); - close (fd); + } - kernel_cmdline[sizeof (kernel_cmdline) - 1] = 0; + if (oflags['s'] || oflags['t'] || oflags['C']) + { + if (oflags['P']) + { + FILE *fp; + pid_file = oargs['P']; + fp = fopen (pid_file, "w"); + if (fp) + { + fprintf (fp, "%d", getpid ()); + fclose (fp); + } + } - if (strstr (kernel_cmdline, search_string)) - fatal_moan ("/proc/cmdline contains %s", search_string); - } + 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']); + } - 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['p']) + { + if (optind < argc) + { + ctx->t = ptty_open (argv[optind], &argv[optind], &size); + } + else + { + 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['C']) + { + ctx->t->close (ctx->t); + return 0; + } + } - if (oflags['C']) { - ctx->t->close(ctx->t); - return 0; - } - } + if (oflags['b']) + { + int baud = safe_atoi (oargs['b']); - if (oflags['b']) { - int baud = safe_atoi (oargs['b']); + if (baud < 0) + fatal_moan ("Unable to parse baudrate %s", oargs['b']); - if (baud < 0) - fatal_moan ("Unable to parse baudrate %s", oargs['b']); + tty_set_baud (ctx->t, baud); - tty_set_baud (ctx->t, baud); + } + tty_set_flow (ctx->t, oflags['f'] ? 1 : 0); } - 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 (oflags['r']) + { + char *id = oargs['r']; - 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 (!id) + fatal_moan ("-r requires an argument"); - if (!client_socket) - fatal_moan ("failed to find socket %s", oargs['r']); + 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); + } - } else if (oflags['c']) { - client_socket = socket_connect (oargs['k']); + if (!client_socket) + fatal_moan ("failed to find socket %s", oargs['r']); - if (!client_socket) - fatal_moan ("failed to connect to socket %s", oargs['k']); + } + 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['I']) { - if (!client_socket) - fatal_moan ("-I requires either -c or -r", oargs['k']); - if (!oargs['I']) - fatal_moan ("-I requires an arugment"); - send_to_server (client_socket, oargs['I']); - } 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 (oflags['I']) + { + if (!client_socket) + fatal_moan ("-I requires either -c or -r", oargs['k']); + if (!oargs['I']) + fatal_moan ("-I requires an arugment"); + send_to_server (client_socket, oargs['I']); + } + 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) + { + if (oflags['c'] && oargs['k']) + { + ansi->set_title (ansi, oargs['k']); + } + else if ((ctx->t) && (ctx->t->name)) + { + ansi->set_title (ansi, ctx->t->name); + } + } - if (ansi->set_title) { - if (oflags['c'] && oargs['k']) { - ansi->set_title (ansi, oargs['k']); - } else if ((ctx->t) && (ctx->t->name)) { - ansi->set_title (ansi, ctx->t->name); } - } - } - } ctx->v = vt102_new (&size); ctx->h = history_new (history); mainloop (ctx, ansi, server_socket, client_socket); - 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