aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstaffcvs <>2008-02-20 18:49:11 +0000
committerstaffcvs <>2008-02-20 18:49:11 +0000
commitccff2e420637c932f13d5aceac6c678836d2605c (patch)
tree77e233ca6f1de36d7c8fa2ca924ec93d498960cc
parentd9a2ac9befcee5e530a5aa387b0f192444ad9730 (diff)
downloadsympathy-ccff2e420637c932f13d5aceac6c678836d2605c.tar.gz
sympathy-ccff2e420637c932f13d5aceac6c678836d2605c.tar.bz2
sympathy-ccff2e420637c932f13d5aceac6c678836d2605c.zip
*** empty log message ***
-rw-r--r--apps/clients.c8
-rw-r--r--apps/mainloop.h5
-rw-r--r--apps/sympathy.c15
-rw-r--r--apps/usage.c4
4 files changed, 27 insertions, 5 deletions
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 <sympathy.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <malloc.h>
#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 <sympathy.h>
-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 <sys/utsname.h>
#include <sys/stat.h>
#include <dirent.h>
+#include <string.h>
+#include <strings.h>
+#include <malloc.h>
#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 <stdio.h>
+#include <stdlib.h>
void
usage (void)