X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=apps%2Fsympathy.c;h=4ea7bf00e730fd8a81ceda048e4d259295418eae;hb=3422c467b484c200c8486da77678a7f4f58d4d0f;hp=964d84cf769009770a6b22802ab9b76a0f5fed07;hpb=d0dc04aa37c03de3dde28fe721466111d75079f9;p=sympathy.git diff --git a/apps/sympathy.c b/apps/sympathy.c index 964d84c..4ea7bf0 100644 --- a/apps/sympathy.c +++ b/apps/sympathy.c @@ -10,6 +10,21 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.11 2008/02/20 20:16:07 james + * *** empty log message *** + * + * Revision 1.10 2008/02/20 19:44:37 james + * @@ + * + * Revision 1.9 2008/02/20 18:49:11 staffcvs + * *** empty log message *** + * + * Revision 1.8 2008/02/20 18:33:37 james + * *** empty log message *** + * + * Revision 1.7 2008/02/20 18:31:44 james + * *** empty log message *** + * * Revision 1.6 2008/02/20 17:18:33 james * *** empty log message *** * @@ -30,75 +45,183 @@ static char rcsid[] = "$Id$"; * */ +#include #include #include +#include +#include +#include +#include +#include +#include +#include + #include "mainloop.h" -char *fatal_moan(char *fmt,...) +extern void usage (void); + +static char hostname[1024]; + +int +safe_atoi (char *a) +{ + char *end; + int ret; + + if (!a) + return -1; + + ret = (int) strtol (a, &end, 0); + + if (end == a) + return -1; + + return ret; +} + +char * +fatal_moan (char *fmt, ...) { -va_list ap; + va_list ap; -va_start(ap, fmt); -n = vfprintf (stderr,fmt,ap); -va_end(ap); + va_start (ap, fmt); + vfprintf (stderr, fmt, ap); + va_end (ap); -putc('\n',stderr); -exit(1); + putc ('\n', stderr); + exit (1); } /*make the path in fmt from home (hence the name) */ -char *mome(char *fmt,...) +char * +mome (char *fmt, ...) { - int n; - int homelen; - char *buf,*home; - va_list ap; + int n; + int homelen; + char *buf, *home; + va_list ap; + int size; + + + home = getenv ("HOME"); + if (!home) + return NULL; + + homelen = strlen (home) + 1; + + size = 1024 + homelen; + buf = malloc (size); - home=getenv("HOME"); - if (!home) return NULL; + if (!buf) + fatal_moan ("malloc failed"); + + strcpy (buf, home); + strcat (buf, "/"); + + while (1) + { + + + va_start (ap, fmt); + n = vsnprintf (buf + homelen, size - homelen, fmt, ap); + va_end (ap); + + if (n > -1 && n < (size - homelen)) + return buf; + + if (n > -1) /* glibc 2.1 */ + size = homelen + n + 1; + else /* glibc 2.0 */ + size *= 2; /* twice the old size */ + + buf = realloc (buf, size); + + if (!buf) + fatal_moan ("malloc failed"); + } +} + + +int +list_sockets (void) +{ + struct dirent *ent; + struct stat buf; + char *sn = NULL; + Socket *s; + char *sockdir = mome ("/.sympathy/"); + DIR *dir = opendir (sockdir); - homelen=strlen(home)+1; - size=1024+homelen; - buf = malloc (size); + int hostname_len = strlen (hostname); - if (!buf) - fatal_moan("malloc failed"); + if (!dir) + fatal_moan ("can't examine %s for sockets", sockdir); - strcpy(buf,home); - strcat(buf,"/"); + rewinddir (dir); - while (1) { + while ((ent = readdir (dir))) + { + sn = mome (".sympathy/%s", ent->d_name); + if (stat (sn, &buf) || (!S_ISSOCK (buf.st_mode))) + { + free (sn); + continue; + } + + s = socket_connect (sn); - va_start(ap, fmt); - n = vsnprintf (buf+homelen, size-homelen, fmt, ap); - va_end(ap); + if (s) + { + printf ("\t%s (Active)\n", ent->d_name); + socket_free (s); + } + else + { + if (strncmp (ent->d_name, hostname, hostname_len)) + { + printf ("\t%s (Unknown - not this host)\n", ent->d_name); + } + else + { + printf ("\t%s (Dead, wiped)\n", ent->d_name); + unlink (sn); + } + } - if (n > -1 && n < len) - return buf; + free (sn); + } - if (n > -1) /* glibc 2.1 */ - size = homelen+n+1; - else /* glibc 2.0 */ - size *= 2; /* twice the old size */ - - buf=realloc(buf,size); + closedir (dir); - if (!buf) - fatal_moan("malloc failed"); - } - } + return 0; } +void +get_hostname (void) +{ + struct utsname name; + + if (uname (&name)) + { + strcpy (hostname, "unknown."); + return; + } + + + strcpy (hostname, name.nodename); + strcat (hostname, "."); +} + int main (int argc, char *argv[]) @@ -113,11 +236,25 @@ main (int argc, char *argv[]) Socket *server_socket = NULL, *client_socket = NULL; ANSI *ansi = NULL; TTY *tty = NULL; + Log *log = NULL; - memset (oflags[128], 0, sizeof (oflags)); - memset (oargs[128], 0, sizeof (oargs)); + int history = 200; - while ((c = getopt (argc, argv, "tscr:d:pb:fL:Fk:n:")) != EOF) + + get_hostname (); + + memset (oflags, 0, sizeof (oflags)); + memset (oargs, 0, sizeof (oargs)); +#if 0 + "sympathy -t [-K] [-d serialdev|-p] [-b baud] [-f] [-L log]\n" + "sympathy -s [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-F] [-k skt]\n" + " [-n hlines]\n" + "sympathy [-s -c] [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-k skt]\n" + " [-n hlines]\n" + "sympathy -c [-H] -k skt\n" + "sympathy -r id [-H]\n" "sympathy {-l|-ls}\n" +#endif + while ((c = getopt (argc, argv, "tscr:lKHd:pb:fL:Fk:n:")) != EOF) { switch (c) { @@ -138,29 +275,57 @@ main (int argc, char *argv[]) } else { - moan ("unknown option %c", c); + fprintf (stderr, "unknown option %c\n", c); usage (); } } } - if (!oflags['s'] && !oflags['c'] && !oflags['t'] && !oflags['r']) + /*Compatability for screen's ls */ + if (oflags['l']) + oflags['s'] = 0; + + + if (!oflags['s'] && !oflags['c'] && !oflags['t'] && !oflags['r'] + && !oflags['l']) { /*If no mode is specified behave like screen */ oflags['s']++; oflags['c']++; } - if ((oflags['t'] && ((oflags['s'] || oflags['c']) || oflags['r'])) || - (oflags['r'] && ((oflags['s'] || oflags['c']) || oflags['t'])) || - ((oflags['s'] || oflags['c']) && (oflags['r'] || oflags['t']))) - fatal_moan ("specifiy exactly one of ( -c and or -s ), -t and -r"); + + { + int sum = 0; + sum += oflags['t']; + sum += (oflags['s'] || oflags['c']) ? 1 : 0; + sum += oflags['r']; + sum += oflags['l']; + + if (sum != 1) + fatal_moan ("specifiy exactly one of ( -c and or -s ), -t, -r and -l"); + } + + + if (oflags['l']) + return list_sockets (); + if (oflags['r'] && oflags['k']) 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 (!history) + fatal_moan ("agrument to -n must be greater than zero"); + } + /*Fold -r into -c */ if (oflags['r']) { @@ -169,14 +334,11 @@ main (int argc, char *argv[]) fatal_moan ("cannot parse -r %s as an integer", oargs['r']); oflags['k']++; - oargs['k'] = mome ("/.sympathy/%d", id); + oargs['k'] = mome ("/.sympathy/%s%d", hostname, id); oflags['r'] = 0; oflags['c']++; } - if (oflags['c'] && !oflags['k']) - fatal_moan ("-c requires a socket to be specified with -s or -k"); - if (oflags['p'] && oflags['d']) fatal_moan ("-p incompatible with -d"); @@ -195,7 +357,7 @@ main (int argc, char *argv[]) mkdir (path, 0700); free (path); - oargs['k'] = mome ("/.sympathy/%d", getpid ()); + oargs['k'] = mome ("/.sympathy/%s%d", hostname, getpid ()); oflags['k']++; } @@ -206,25 +368,35 @@ main (int argc, char *argv[]) fatal_moan ("failed to create socket %s for listening", oargs['k']); } - switch (fork ()) + if (oflags['s'] && oflags['c']) { - case 0: /*child becomes the server */ - oflags['c'] = 0; - oflags['H'] = 0; - break; - case -1: - fatal_moan ("fork failed"); - default: - oflags['s'] = 0; - oflags['K'] = 0; - oflags['d'] = 0; - oflags['p'] = 0; - oflags['b'] = 0; - oflags['f'] = 0; - oflags['L'] = 0; - oflags['n'] = 0; + switch (fork ()) + { + case 0: /*child becomes the server */ + oflags['c'] = 0; + oflags['H'] = 0; + break; + case -1: + fatal_moan ("fork failed"); + default: + oflags['s'] = 0; + oflags['K'] = 0; + oflags['d'] = 0; + oflags['p'] = 0; + oflags['b'] = 0; + oflags['f'] = 0; + oflags['L'] = 0; + oflags['n'] = 0; + if (server_socket) + { + socket_free_parent (server_socket); + server_socket = NULL; + } + } } + if (oflags['c'] && !oflags['k']) + fatal_moan ("-c requires a socket to be specified with -s or -k"); if ((oflags['p'] || oflags['d'] || oflags['K'] || oflags['b'] || oflags['f'] || oflags['L']) && oflags['c']) @@ -236,6 +408,11 @@ main (int argc, char *argv[]) oflags['p']++; } + if (oflags['s'] && !oflags['F']) + { + daemon (1, 0); /*incase socket is relative path, unlink then will fail */ + } + if (oflags['s'] || oflags['t']) { @@ -250,6 +427,8 @@ main (int argc, char *argv[]) if (oflags['p']) { tty = ptty_open (NULL, NULL); + if (!tty) + fatal_moan ("unable to open a ptty"); } else { @@ -257,7 +436,7 @@ main (int argc, char *argv[]) serial_open (oargs['d'], oflags['K'] ? SERIAL_LOCK_ACTIVE : SERIAL_LOCK_PASSIVE); - if (tty) + if (!tty) fatal_moan ("unable to open serial port %s", oargs['d']); } @@ -266,7 +445,7 @@ main (int argc, char *argv[]) int baud = safe_atoi (oargs['b']); if (baud < 0) - fatal_maon ("Unable to parse baudrate %s", oargs['b']); + fatal_moan ("Unable to parse baudrate %s", oargs['b']); tty_set_baud (tty, baud); @@ -286,35 +465,41 @@ main (int argc, char *argv[]) } + if (oflags['c'] || oflags['t']) { if (oflags['H']) { - fatal_moan ("fix a bug in HTML dispatcher before this works"); + ansi=ansi_new_html(stdout); } else { - ansi = (ANSI *) malloc (sizeof (ANSI)); - memset (ansi, 0, sizeof (ANSI)); - terminal_register_handlers (); - ansi->terminal = terminal_open (0, 1); - ansi_reset (ansi, NULL); + ansi=ansi_new_from_terminal(terminal_open(0,1)); + ansi->reset(ansi, NULL); } } - if (oflags['s'] && !oflags['F']) { - /*FIXME become a daemon*/ - } - - mainloop (tty, server_socket, client_socket, ansi, log); + mainloop (tty, server_socket, client_socket, ansi, log, history); if (ansi) { - ansi_terminal_reset (ansi); + ansi->close(ansi); terminal_atexit (); } + if (tty) + tty->close (tty); + + if (log) + log->close (log); + if (server_socket) + socket_free (server_socket); + if (client_socket) + socket_free (client_socket); + + if (!oflags['H']) + printf ("you have now exited sympathy\n"); return 0; }