*** empty log message ***

[sympathy.git] / apps / sympathy.c

diff --git a/apps/sympathy.c b/apps/sympathy.c
index 3ade5cd005f9f3d06ef26d60c3059b3909a573e0..e93c9302398df284a2cbbcee273c7abe6ac5678d 100644 (file)
--- a/apps/sympathy.c
+++ b/apps/sympathy.c
@@ -11,12 +11,6 @@ static char rcsid[] =
 
 /*
  * $Log$
- * Revision 1.19  2008/02/27 09:47:05  james
- * *** empty log message ***
- *
- * Revision 1.18  2008/02/27 09:42:53  james
- * *** empty log message ***
- *
  * Revision 1.17  2008/02/27 09:42:21  james
  * *** empty log message ***
  *
@@ -254,7 +248,7 @@ main (int argc, char *argv[])
   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};
 
   int oflags[128];
   char *oargs[128];
@@ -304,6 +298,15 @@ main (int argc, char *argv[])
     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']++;
+    }
+
+
   {
     int sum = 0;
     sum += oflags['t'];
@@ -312,23 +315,14 @@ main (int argc, char *argv[])
     sum += oflags['l'];
     sum += oflags['v'];
 
-    if (!sum) {
-      /*If no mode is specified behave like screen */
-      oflags['s']++;
-      oflags['c']++;
-    }
-       
     if (sum != 1)
-      fatal_moan
-        ("specifiy exactly one of ( -c and or -s ), -t, -r, -l and -v");
+      fatal_moan ("specifiy exactly one of ( -c and or -s ), -t, -r, -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("Version: %s\n",libsympathy_version());
+       return 0;
+  }
 
   if (oflags['l'])
     return list_sockets ();
@@ -434,24 +428,22 @@ main (int argc, char *argv[])
 
   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);
+       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 ((size.y > VT102_ROWS) || (size.y < 1))
-        fatal_moan ("-w requires a height between 1 and %d\n",
-                    VT102_MAX_COLS);
-
+        fatal_moan ("-w requires a height between 1 and %d\n", VT102_MAX_COLS);
+       
     }
 
   if (oflags['s'] && !oflags['F'])