/*
* $Log$
+ * Revision 1.24 2008/02/28 22:00:42 james
+ * *** empty log message ***
+ *
+ * Revision 1.23 2008/02/28 16:57:51 james
+ * *** empty log message ***
+ *
* Revision 1.22 2008/02/28 01:47:44 james
* *** empty log message ***
*
int c;
extern char *optarg;
extern int optind, opterr, optopt;
- CRT_Pos size = { VT102_COLS_80, VT102_ROWS };
+ CRT_Pos size = { VT102_COLS_80, VT102_ROWS_24 };
+
+ int csnok_pipe[2] = { 0 };
+ int csnok = 0;
int oflags[128];
char *oargs[128];
Log *log = NULL;
int history = 200;
-
+ int pid;
get_hostname ();
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");
fatal_moan ("cannot parse -r %s as an integer", oargs['r']);
oflags['k']++;
- if (safe_atoi(id)>0) {
- oargs['k'] = mome ("/.sympathy/%s%d", hostname, safe_atoi(id));
- } else {
- oargs['k'] = mome ("/.sympathy/%s", id);
- }
+ if (safe_atoi (id) > 0)
+ {
+ oargs['k'] = mome ("/.sympathy/%s%d", hostname, safe_atoi (id));
+ }
+ else
+ {
+ oargs['k'] = mome ("/.sympathy/%s", id);
+ }
oflags['r'] = 0;
oflags['c']++;
}
if (oflags['p'] && oflags['d'])
fatal_moan ("-p incompatible with -d");
- /*implement server and client by opening the server socket to prevent */
- /*a race condition, and then forking and munging the cmd line options */
- /*in the parent and child so that the child is the server and the */
- /*parent becomes its client */
if (oflags['c'] && oflags['s'] && oflags['F'])
fatal_moan ("-F is incompatible with -c -s");
- if (oflags['s'] && !oflags['k'])
- {
- char *path;
- path = mome ("/.sympathy");
- mkdir (path, 0700);
- free (path);
-
- oargs['k'] = mome ("/.sympathy/%s%d", hostname, getpid ());
- oflags['k']++;
- }
-
- if (oflags['s'])
- {
- server_socket = socket_listen (oargs['k']);
- if (!server_socket)
- fatal_moan ("failed to create socket %s for listening", oargs['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'])
{
- switch (fork ())
+ if (!oflags['k'])
+ {
+ csnok++;
+ pipe (csnok_pipe);
+ }
+
+ switch (pid = fork ())
{
case 0: /*child becomes the server */
oflags['c'] = 0;
oflags['H'] = 0;
+
+ if (csnok)
+ close (csnok_pipe[0]);
break;
case -1:
fatal_moan ("fork failed");
- default:
+ default: /*parent becomes client*/
oflags['s'] = 0;
oflags['K'] = 0;
oflags['d'] = 0;
oflags['L'] = 0;
oflags['n'] = 0;
oflags['w'] = 0;
- if (server_socket)
+
+ /*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)
{
- socket_free_parent (server_socket);
- server_socket = NULL;
+ 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 ((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_ROWS) || (size.y < 1))
+ if ((size.y > VT102_MAX_ROWS) || (size.y < 1))
fatal_moan ("-w requires a height between 1 and %d\n",
VT102_MAX_COLS);
if (oflags['s'] && !oflags['F'])
{
- daemon (1, 0); /*incase socket is relative path, unlink then will fail */
+ /*nochdir incase socket is relative path, unlink then will fail */
+ daemon (1, 0);
+
+ /*Tell our parent's parent what our pid is */
+ if (csnok)
+ {
+ pid = getpid ();
+
+ write (csnok_pipe[1], &pid, sizeof (pid));
+ close (csnok_pipe[1]);
+ }
}
+ if (oflags['s'] )
+ {
+ char *path;
+ path = mome ("/.sympathy");
+ mkdir (path, 0700);
+ free (path);
+
+
+ if (!oflags['k']) {
+ pid = getpid ();
+
+ oargs['k'] = mome ("/.sympathy/%s%d", hostname, pid);
+ oflags['k']++;
+ }
+
+ server_socket = socket_listen (oargs['k']);
+ if (!server_socket)
+ fatal_moan ("failed to create socket %s for listening", oargs['k']);
+
+ }
+
if (oflags['s'] || oflags['t'])
{
}
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);
- }
+ /*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);
+ }
tty =
serial_open (oargs['d'],