summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2016-06-29 09:49:01 +0100
committerPádraig Brady <P@draigBrady.com>2016-06-29 10:00:05 +0100
commitdfae7822006074d145dd7f2e4c88a9419604f9d9 (patch)
tree136b8f6f211060acc48d600f8248d54fcff5e795
parent26616776c0c620ce72b3b69aa5ed63f495552a9e (diff)
downloadcoreutils-dfae7822006074d145dd7f2e4c88a9419604f9d9.tar.xz
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
-rw-r--r--NEWS3
-rw-r--r--src/stty.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index bfaf2399e..e03952e85 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 44cdcddc6..467f8ae89 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