From: staffcvs Date: Wed, 20 Feb 2008 18:49:11 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=sympathy.git;a=commitdiff_plain;h=1d00929f790c7e65eac1bc90ba9d7e520a1b7462 *** empty log message *** --- diff --git a/apps/clients.c b/apps/clients.c index 73bf655..80b7750 100644 --- a/apps/clients.c +++ b/apps/clients.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.9 2008/02/20 18:49:11 staffcvs + * *** empty log message *** + * * Revision 1.8 2008/02/20 18:31:44 james * *** empty log message *** * @@ -37,6 +40,11 @@ static char rcsid[] = "$Id$"; */ #include +#include +#include +#include +#include +#include #include "clients.h" static void diff --git a/apps/mainloop.h b/apps/mainloop.h index 23d6e12..3bbd960 100644 --- a/apps/mainloop.h +++ b/apps/mainloop.h @@ -12,6 +12,9 @@ /* * $Log$ + * Revision 1.2 2008/02/20 18:49:11 staffcvs + * *** empty log message *** + * * Revision 1.1 2008/02/20 18:33:37 james * *** empty log message *** * @@ -22,7 +25,7 @@ #include -void +extern void mainloop (TTY * tty, Socket * server_socket, Socket * client_socket, ANSI * a, Log * log, int nhistory); diff --git a/apps/sympathy.c b/apps/sympathy.c index a754b3d..94105a3 100644 --- a/apps/sympathy.c +++ b/apps/sympathy.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * 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 *** * @@ -43,6 +46,9 @@ static char rcsid[] = "$Id$"; #include #include #include +#include +#include +#include #include "mainloop.h" @@ -396,6 +402,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']) { @@ -448,10 +459,6 @@ main (int argc, char *argv[]) } - if (oflags['s'] && !oflags['F']) - { - daemon (1, 0); /*incase socket is relative path, unlink then will fail */ - } if (oflags['c'] || oflags['t']) { diff --git a/apps/usage.c b/apps/usage.c index b34d75b..1a9273f 100644 --- a/apps/usage.c +++ b/apps/usage.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.6 2008/02/20 18:49:11 staffcvs + * *** empty log message *** + * * Revision 1.5 2008/02/20 18:31:44 james * *** empty log message *** * @@ -28,6 +31,7 @@ static char rcsid[] = "$Id$"; */ #include +#include void usage (void)