*** empty log message ***

diff --git a/apps/sympathy.c b/apps/sympathy.c
index 29c328085789780aacc8a03d352fbc47447d933d..6e869be9349028a24bc669b76019e04de786bfe1 100644 (file)
--- a/apps/sympathy.c
+++ b/apps/sympathy.c
@@ -11,6 +11,12 @@ static char rcsid[] =
 
 /*
  * $Log$
 
 /*
  * $Log$

+ * Revision 1.20  2008/02/27 10:00:34  james
+ * *** empty log message ***
+ *
+ * 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.18  2008/02/27 09:42:53  james
  * *** empty log message ***
  *


@@ -301,15 +307,6 @@ main (int argc, char *argv[])
     oflags['s'] = 0;
 
 
     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'];
   {
     int sum = 0;
     sum += oflags['t'];


@@ -318,6 +315,13 @@ main (int argc, char *argv[])
     sum += oflags['l'];
     sum += oflags['v'];
 
     sum += oflags['l'];
     sum += oflags['v'];
 

+    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");
     if (sum != 1)
       fatal_moan
         ("specifiy exactly one of ( -c and or -s ), -t, -r, -l and -v");


@@ -325,7 +329,8 @@ main (int argc, char *argv[])
 
   if (oflags['v'])
     {
 
   if (oflags['v'])
     {

-      fprintf ("Version: %s\n", libsympathy_version ());
+      fprintf (stderr, "Version: %s\n", libsympathy_version ());
+      fprintf (stderr, "Version: %s\n", rcsid);

       return 0;
     }
 
       return 0;
     }
 

diff --git a/apps/usage.c b/apps/usage.c
index 598ccb733411e0bd9277738b04d96e8c5fb70335..d06bf054f085e72f0416432f823ebdb59d14c767 100644 (file)
--- a/apps/usage.c
+++ b/apps/usage.c
@@ -10,6 +10,12 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
 
 /*
  * $Log$

+ * Revision 1.14  2008/02/27 09:55:57  james
+ * *** empty log message ***
+ *
+ * Revision 1.13  2008/02/27 09:42:53  james
+ * *** empty log message ***
+ *

  * Revision 1.12  2008/02/27 09:42:21  james
  * *** empty log message ***
  *
  * Revision 1.12  2008/02/27 09:42:21  james
  * *** empty log message ***
  *


@@ -58,9 +64,9 @@ usage (void)
   fprintf (stderr, "Usage:\n"
            "sympathy -t      [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-u]\n"
            "sympathy -s      [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-u] [-k skt]\n"
   fprintf (stderr, "Usage:\n"
            "sympathy -t      [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-u]\n"
            "sympathy -s      [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-u] [-k skt]\n"

-           "                      [-n hlines] [-w width] [-F]\n"
+           "                      [-n hlines] [-w WxH] [-F]\n"

            "sympathy [-s -c] [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-u] [-k skt]\n"
            "sympathy [-s -c] [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-u] [-k skt]\n"

-           "                      [-n hlines] [-w width]\n"
+           "                      [-n hlines] [-w WxH]\n"

            "sympathy -c      [-H] [-u] -k skt\n"
            "sympathy -r id   [-H] [-u]\n"
            "sympathy {-l|-ls}\n"
            "sympathy -c      [-H] [-u] -k skt\n"
            "sympathy -r id   [-H] [-u]\n"
            "sympathy {-l|-ls}\n"


@@ -69,27 +75,27 @@ usage (void)
            "\n"
            "Main mode:\n"
            "   -t  terminal emulator mode: one process is started which reads from\n"
            "\n"
            "Main mode:\n"
            "   -t  terminal emulator mode: one process is started which reads from\n"

-           "          the serial device or ptty and writes to the users terminal.\n"
+           "          the serial device or ptty and writes to the user's terminal.\n"

            "   -s  server mode: a process is started (and daemonized unless -F is\n"
            "          given) which listens on a socket, and reads from the serial\n"
            "          device or ptty.\n"
            "   -s  server mode: a process is started (and daemonized unless -F is\n"
            "          given) which listens on a socket, and reads from the serial\n"
            "          device or ptty.\n"

-           "   -s -c  server and client mode. Fork a server and connect a client\n"
+           "   -s -c  server and client mode: Fork a server and connect a client\n"

            "            incompatible with -F. This is the default mode\n"
            "   -c     client mode: connect to server mode process\n"
            "   -r id  client mode: connect to server mode process on socket\n"
            "             ~/.sympathy/id\n"
            "   -l or -ls  list active sockets in ~/.sympathy\n"
            "            incompatible with -F. This is the default mode\n"
            "   -c     client mode: connect to server mode process\n"
            "   -r id  client mode: connect to server mode process on socket\n"
            "             ~/.sympathy/id\n"
            "   -l or -ls  list active sockets in ~/.sympathy\n"

-          "   -v   show version\n"
-          "   -h   show help\n"
+           "   -v   show version\n"
+           "   -h   show help\n"

            "\n"
            "Options:\n"
            "   -K  lock the serial device. By default sympathy checks that no\n"
            "\n"
            "Options:\n"
            "   -K  lock the serial device. By default sympathy checks that no\n"

-           "          other process has create a lock file, and temporarily ceases\n"
+           "          other process has created a lock file, and temporarily ceases\n"

            "          to access the serial port if it spots one. With this option\n"
            "          sympathy creates a lock file and prevents other programs\n"
            "          accessing the serial port. Incompatible with -p\n"
            "   -d serialdev  the serial device to connect to, eg /dev/ttyS0\n"
            "          to access the serial port if it spots one. With this option\n"
            "          sympathy creates a lock file and prevents other programs\n"
            "          accessing the serial port. Incompatible with -p\n"
            "   -d serialdev  the serial device to connect to, eg /dev/ttyS0\n"

-           "   -p   fork a login shell in a pty and connect to that rather than\n"
+           "   -p   fork a login shell in a ptty and connect to that rather than\n"

            "           connect to a serial port. This option is the default if\n"
            "           no -d option is specified\n"
            "   -b baud  the baudrate to set. If omitted sympathy does not set\n"
            "           connect to a serial port. This option is the default if\n"
            "           no -d option is specified\n"
            "   -b baud  the baudrate to set. If omitted sympathy does not set\n"


@@ -105,7 +111,9 @@ usage (void)
            "   -n  hlines  the number of lines of history to store in the\n"
            "                 server, that are replayed on connexion\n"
            "   -u  don't emit utf-8 try to use ISO-2202 to the local terminal\n"
            "   -n  hlines  the number of lines of history to store in the\n"
            "                 server, that are replayed on connexion\n"
            "   -u  don't emit utf-8 try to use ISO-2202 to the local terminal\n"

-           "   -w width  start session with a screen of width width<=132\n");
+           "   -w W[xH]  start session with a screen of size W by H. 0<W<=132,\n"
+           "             0<H<24, default 80 by 24\n"
+           );

 
 
   exit (1);
 
 
   exit (1);

diff --git a/version-md5sums b/version-md5sums
index 33374eefe29d5da4a45fbcc4a985cbe96b27cae2..998b19fd835e99ceb8467151720596130f90c6f7 100644 (file)
--- a/version-md5sums
+++ b/version-md5sums
@@ -3,3 +3,4 @@ ca1ac5a7fc122af620b0cf7296c324c3        1.0.2
 ac9d93b50970b366e4531b4ea5a1c983       1.0.3
 ac9d93b50970b366e4531b4ea5a1c986       1.1.0
 0ea0fc96142920321bfa5354dc6b9da9       1.1.1
 ac9d93b50970b366e4531b4ea5a1c983       1.0.3
 ac9d93b50970b366e4531b4ea5a1c986       1.1.0
 0ea0fc96142920321bfa5354dc6b9da9       1.1.1

+b1b1d8caa83556877bb96487f0c6a934       1.1.2