diff options
author | james <> | 2008-02-27 10:00:43 +0000 |
---|---|---|
committer | james <> | 2008-02-27 10:00:43 +0000 |
commit | 8b8c706d48dca2edbe4789d94df7e4e93dd96c68 (patch) | |
tree | 3f1235a102d8185bb3a1384809bdfabe3fa924e4 | |
parent | 5fcf060253b604c6a708612a5b2f3f5088bee2d3 (diff) | |
download | sympathy-8b8c706d48dca2edbe4789d94df7e4e93dd96c68.tar.gz sympathy-8b8c706d48dca2edbe4789d94df7e4e93dd96c68.tar.bz2 sympathy-8b8c706d48dca2edbe4789d94df7e4e93dd96c68.zip |
*** empty log message ***
-rw-r--r-- | apps/sympathy.c | 4 | ||||
-rw-r--r-- | apps/usage.c | 19 | ||||
-rw-r--r-- | version-md5sums | 1 | ||||
-rw-r--r-- | version-micro | 2 |
4 files changed, 18 insertions, 8 deletions
diff --git a/apps/sympathy.c b/apps/sympathy.c index 3ade5cd..6e869be 100644 --- a/apps/sympathy.c +++ b/apps/sympathy.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $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 *** * @@ -316,6 +319,7 @@ main (int argc, char *argv[]) /*If no mode is specified behave like screen */ oflags['s']++; oflags['c']++; + sum++; } if (sum != 1) diff --git a/apps/usage.c b/apps/usage.c index d86294e..d06bf05 100644 --- a/apps/usage.c +++ b/apps/usage.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $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 *** * @@ -61,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" - " [-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" - " [-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" @@ -72,11 +75,11 @@ usage (void) "\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 -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" @@ -87,12 +90,12 @@ usage (void) "\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" - " -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" @@ -108,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" - " -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); diff --git a/version-md5sums b/version-md5sums index 33374ee..998b19f 100644 --- 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 +b1b1d8caa83556877bb96487f0c6a934 1.1.2 diff --git a/version-micro b/version-micro index d00491f..0cfbf08 100644 --- a/version-micro +++ b/version-micro @@ -1 +1 @@ -1 +2 |