merge with 1.8.1g

1 files changed, 188 insertions, 6 deletions

diff --git a/src/stty.c b/src/stty.c
index 4f97981ae..dec68a7a7 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -119,7 +119,13 @@
 #define	CLNEXT Control ('v')
 #endif
 #if defined(VFLUSHO) && !defined(CFLUSHO)
-#define	CFLUSHO Control ('o')
+#define CFLUSHO Control ('o')
+#endif
+#if defined(VDISCARD) && !defined(VFLUSHO)
+#define VFLUSHO VDISCARD
+#endif
+#if defined(VSTATUS) && !defined(CSTATUS)
+#define CSTATUS Control ('t')
 #endif
 
 char *visible ();
@@ -365,6 +371,10 @@ static struct control_info control_info[] =
 #ifdef VFLUSHO
   {"flush", CFLUSHO, VFLUSHO},
 #endif
+#ifdef VSTATUS
+  {"status", CSTATUS, VSTATUS},
+#endif
+
 
   /* These must be last because of the display routines. */
   {"min", 1, VMIN},
@@ -433,12 +443,184 @@ wrapf (message, va_alist)
 }
 
 static void
-usage ()
+usage (status)
+     int status;
 {
-  fprintf (stderr,
-      "Usage: %s [{--help,--version}] [-ag] [--all] [--save] [setting...]\n",
+  fprintf (status == 0 ? stdout : stderr, "\
+Usage: %s [OPTION]... [SETTING]...\n\
+",
 	   program_name);
-  exit (1);
+
+  if (status != 0)
+    fprintf (stderr, "\nTry `%s --help' for more information.\n",
+	     program_name);
+  else
+    {
+      printf ("\
+\n\
+  -a, --all       print all current settings in human-readable form\n\
+  -g, --save      print all current settings in a stty-readable form\n\
+      --help      display this help and exit\n\
+      --version   output version information and exit\n\
+\n\
+Optionnal - before SETTING indicates negation.  An * marks non-POSIX\n\
+settings.  The underlying system defines which settings are available.\n\
+");
+      printf ("\
+\n\
+Special characters:\n\
+* dsusp CHAR    CHAR will send a terminal stop signal once input flushed\n\
+  eof CHAR      CHAR will send an end of file (terminate the input)\n\
+  eol CHAR      CHAR will end the line\n\
+* eol2 CHAR     alternate CHAR for ending the line\n\
+  erase CHAR    CHAR will erase the last character typed\n\
+  intr CHAR     CHAR will send an interrupt signal\n\
+  kill CHAR     CHAR will erase the current line\n\
+* lnext CHAR    CHAR will enter the next character quoted\n\
+  quit CHAR     CHAR will send a quit signal\n\
+* rprnt CHAR    CHAR will redraw the current line\n\
+  start CHAR    CHAR will restart the output after stopping it\n\
+  stop CHAR     CHAR will stop the output\n\
+  susp CHAR     CHAR will send a terminal stop signal\n\
+* swtch CHAR    CHAR will switch to a different shell layer\n\
+* werase CHAR   CHAR will erase the last word typed\n\
+");
+      printf ("\
+\n\
+Special settings:\n\
+  N             set the input and output speeds to N bauds\n\
+* cols N        tell the kernel that the terminal has N columns\n\
+* columns N     same as cols N\n\
+  ispeed N      set the input speed to N\n\
+* line N        use line discipline N\n\
+  min N         with -icanon, set N characters minimum for a completed read\n\
+  ospeed N      set the output speed to N\n\
+* rows N        tell the kernel that the terminal has N rows\n\
+* size          print the number of rows and columns according to the kernel\n\
+  speed         print the terminal speed\n\
+  time N        with -icanon, set read timeout of N tenths of a second\n\
+");
+      printf ("\
+\n\
+Control settings:\n\
+  [-]clocal     disable modem control signals\n\
+  [-]cread      allow input to be received\n\
+* [-]crtscts    enable RTS/CTS handshaking\n\
+  csN           set character size to N bits, N in [5..8]\n\
+  [-]cstopb     use two stop bits per character (one with `-')\n\
+  [-]hup        send a hangup signal when the last process closes the tty\n\
+  [-]hupcl      same as [-]hup\n\
+  [-]parenb     generate parity bit in output and expect parity bit in input\n\
+  [-]parodd     set odd parity (even with `-')\n\
+");
+      printf ("\
+\n\
+Input settings:\n\
+  [-]brkint     breaks cause an interrupt signal\n\
+  [-]icrnl      translate carriage return to newline\n\
+  [-]ignbrk     ignore breaks\n\
+  [-]igncr      ignore carriage return\n\
+  [-]ignpar     ignore parity errors\n\
+* [-]imaxbel    beep and do not flush a full input buffer on a character\n\
+  [-]inlcr      translate newline to carriage return\n\
+  [-]inpck      enable input parity checking\n\
+  [-]istrip     clear high (8th) bit of input characters\n\
+* [-]iuclc      translate uppercase characters to lowercase\n\
+* [-]ixany      let any character restart output, not only start character\n\
+  [-]ixoff      enable sending of start/stop characters\n\
+  [-]ixon       enable XON/XOFF flow control\n\
+  [-]parmrk     mark parity errors (with a 255-0-character sequence)\n\
+  [-]tandem     same as [-]ixoff\n\
+");
+      printf ("\
+\n\
+Output settings:\n\
+* bsN           backspace delay style, N in [0..1]\n\
+* crN           carriage return delay style, N in [0..3]\n\
+* ffN           form feed delay style, N in [0..1]\n\
+* nlN           newline delay style, N in [0..1]\n\
+* [-]ocrnl      translate carriage return to newline\n\
+* [-]ofdel      use delete characters for fill instead of null characters\n\
+* [-]ofill      use fill (padding) characters instead of timing for delays\n\
+* [-]olcuc      translate lowercase characters to uppercase\n\
+* [-]onlcr      translate newline to carriage return-newline\n\
+* [-]onlret     newline performs a carriage return\n\
+* [-]onocr      do not print carriage returns in the first column\n\
+  [-]opost      postprocess output\n\
+* tabN          horizontal tab delay style, N in [0..3]\n\
+* tabs          same as tab0\n\
+* -tabs         same as tab3\n\
+* vtN           vertical tab delay style, N in [0..1]\n\
+");
+      printf ("\
+\n\
+Local settings:\n\
+  [-]crterase   echo erase characters as backspace-space-backspace\n\
+* crtkill       kill all line by obeying the echoprt and echoe settings\n\
+* -crtkill      kill all line by obeying the echoctl and echok settings\n\
+* [-]ctlecho    echo control characters in hat notation (`^c')\n\
+  [-]echo       echo input characters\n\
+* [-]echoctl    same as [-]ctlecho\n\
+  [-]echoe      same as [-]crterase\n\
+  [-]echok      echo a newline after a kill character\n\
+* [-]echoke     same as [-]crtkill\n\
+  [-]echonl     echo newline even if not echoing other characters\n\
+* [-]echoprt    echo erased characters backward, between `\\' and '/'\n\
+  [-]icanon     enable erase, kill, werase, and rprnt special characters\n\
+  [-]iexten     enable non-POSIX special characters\n\
+  [-]isig       enable interrupt, quit, and suspend special characters\n\
+  [-]noflsh     disable flushing after interrupt and quit special characters\n\
+* [-]prterase   same as [-]echoprt\n\
+* [-]tostop     stop background jobs that try to write to the terminal\n\
+* [-]xcase      with icanon, escape with `\\' for uppercase characters\n\
+");
+      printf ("\
+\n\
+Combination settings:\n\
+* [-]LCASE      same as [-]lcase\n\
+  cbreak        same as -icanon\n\
+  -cbreak       same as icanon\n\
+  cooked        same as brkint ignpar istrip icrnl ixon opost isig\n\
+                icanon, eof and eol characters to their default values\n\
+  -cooked       same as raw\n\
+  crt           same as echoe echoctl echoke\n\
+  dec           same as echoe echoctl echoke -ixany intr ^c erase 0177\n\
+                kill ^u\n\
+* [-]decctlq    same as [-]ixany\n\
+  ek            erase and kill characters to their default values\n\
+  evenp         same as parenb -parodd cs7\n\
+  -evenp        same as -parenb cs8\n\
+* [-]lcase      same as xcase iuclc olcuc\n\
+  litout        same as -parenb -istrip -opost cs8\n\
+  -litout       same as parenb istrip opost cs7\n\
+  nl            same as -icrnl -onlcr\n\
+  -nl           same as icrnl -inlcr -igncr onlcr -ocrnl -onlret\n\
+  oddp          same as parenb parodd cs7\n\
+  -oddp         same as -parenb cs8\n\
+  [-]parity     same as [-]evenp\n\
+  pass8         same as -parenb -istrip cs8\n\
+  -pass8        same as parenb istrip cs7\n\
+  raw           same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n\
+                -inlcr -igncr -icrnl  -ixon  -ixoff  -iuclc  -ixany\n\
+                -imaxbel -opost -isig -icanon -xcase min 1 time 0\n\
+  -raw          same as cooked\n\
+  sane          same as cread -ignbrk brkint -inlcr -igncr icrnl\n\
+                -ixoff -iucl -ixany imaxbel opost -olcuc -ocrnl onlcr\n\
+                -onocr -onlret -ofill -ofdel nl0 cr0 tab0 bs0 vt0 ff0\n\
+                isig icanon iexten echo echoe echok -echonl -noflsh\n\
+                -xcase -tostop -echoprt echoctl echoke, all special\n\
+                characters to their default values.\n\
+");
+      printf ("\
+\n\
+Handle the tty line connected to standard input.  Without arguments,\n\
+prints baud rate, line discipline, and deviations from stty sane.  In\n\
+settings, CHAR is taken literally, or coded as in ^c, 0x37, 0177 or\n\
+127; special values ^- or undef used to disable special characters.\n\
+");
+    }
+
+  exit (status);
 }
 
 void
@@ -482,7 +664,7 @@ done:;
     }
 
   if (show_help)
-    usage ();
+    usage (0);
 
   if (tcgetattr (0, &mode))
     error (1, errno, "standard input");