From: Pádraig Brady <P@draigBrady.com>
Date: Wed, 29 Jun 2016 08:49:01 +0000 (+0100)
Subject: stty: fix sane setting of susp to ^z on Solaris
X-Git-Tag: v8.26~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfae7822006074d145dd7f2e4c88a9419604f9d9;p=thirdparty%2Fcoreutils.git

stty: fix sane setting of susp to ^z on Solaris

* src/stty.c: Disable setting of "swtch" to ^z as that
conflicts with and disables using ^z as "susp".
* NEWS: Mention the bug fix.
Reported and tested by Rich Burridge at:
http://bugs.gnu.org/23866
---

diff --git a/NEWS b/NEWS
index bfaf2399e0..e03952e85d 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ GNU coreutils NEWS                                    -*- outline -*-
   stty --help no longer outputs extraneous gettext header lines
   for translated languages. [bug introduced in coreutils-8.24]
 
+  stty "sane" again sets "susp" to ^z on Solaris, and leaves "swtch" undefined.
+  [This bug previously fixed only on some older Solaris systems]
+
   seq now immediately exits upon write errors.
   [This bug was present in "the beginning".]
 
diff --git a/src/stty.c b/src/stty.c
index 44cdcddc68..467f8ae89c 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -118,9 +118,9 @@
 # define CSWTCH _POSIX_VDISABLE
 #endif
 
-/* SunOS 5.3 loses (^Z doesn't work) if 'swtch' is the same as 'susp'.
+/* SunOS >= 5.3 loses (^Z doesn't work) if 'swtch' is the same as 'susp'.
    So the default is to disable 'swtch.'  */
-#if defined __sparc__ && defined __svr4__
+#if defined __sun
 # undef CSWTCH
 # define CSWTCH _POSIX_VDISABLE
 #endif