diff options
| author | Jim Meyering <jim@meyering.net> | 1993-11-15 14:32:17 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1993-11-15 14:32:17 +0000 |
| commit | 4bce07bc255df2556f53dda05394025c9e712e2b (patch) | |
| tree | 16bb2ef1ab210331f597dd43249535b902aefaba | |
| parent | 39fd5971dd6fcb6e93db4e33cfa6bedbc4dd8610 (diff) | |
| download | coreutils-4bce07bc255df2556f53dda05394025c9e712e2b.tar.xz | |
merge with 1.9a
| -rw-r--r-- | old/sh-utils/ChangeLog | 20 | ||||
| -rw-r--r-- | old/sh-utils/NEWS | 4 | ||||
| -rw-r--r-- | src/id.c | 1 | ||||
| -rw-r--r-- | src/stty.c | 6 | ||||
| -rw-r--r-- | src/who.c | 14 |
5 files changed, 41 insertions, 4 deletions
diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog index 6433924ba..249f4d7a0 100644 --- a/old/sh-utils/ChangeLog +++ b/old/sh-utils/ChangeLog @@ -1,3 +1,23 @@ +Sat Nov 13 00:11:19 1993 Jim Meyering (meyering@comco.com) + + * Version 1.9.1. + + * configure.in [LIBS]: Add -lbsd if that is necessary to get the + syslog function. With help from Kaveh Ghazi. + +Thu Nov 11 23:55:48 1993 Jim Meyering (meyering@comco.com) + + * id.c [NGROUPS_MAX]: Undefine before redefining. + From Kaveh R. Ghazi (ghazi@noc.rutgers.edu). + + * who.c (list_entries): Trim any trailing blanks from ut_name + and make sure the string is NUL-terminated before printing it. + Before, `who -q' displayed 8-character names with a tty + (e.g. `q1') suffix. + + * stty.c [CFLUSHO]: Move this definition so it follows the + one for VFLUSHO. + Mon Nov 08 23:16:36 1993 Jim Meyering (meyering@comco.com) * Version 1.9. diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS index ef4278c7c..4b3f4c3d5 100644 --- a/old/sh-utils/NEWS +++ b/old/sh-utils/NEWS @@ -1,3 +1,7 @@ +Major changes in release 1.9.1: +* stty can be built on Suns again +* minor fix for who -q + Major changes in release 1.9: * su fails gracefully when getpass is unable to open /dev/tty. * printenv and tty detect and report write errors @@ -42,6 +42,7 @@ #ifdef _POSIX_VERSION #include <limits.h> #if !defined(NGROUPS_MAX) || NGROUPS_MAX < 1 +#undef NGROUPS_MAX #define NGROUPS_MAX sysconf (_SC_NGROUPS_MAX) #endif /* !NGROUPS_MAX */ diff --git a/src/stty.c b/src/stty.c index 07307ff37..60f2ec9f1 100644 --- a/src/stty.c +++ b/src/stty.c @@ -118,12 +118,12 @@ #if defined(VLNEXT) && !defined(CLNEXT) #define CLNEXT Control ('v') #endif -#if defined(VFLUSHO) && !defined(CFLUSHO) -#define CFLUSHO Control ('o') -#endif #if defined(VDISCARD) && !defined(VFLUSHO) #define VFLUSHO VDISCARD #endif +#if defined(VFLUSHO) && !defined(CFLUSHO) +#define CFLUSHO Control ('o') +#endif #if defined(VSTATUS) && !defined(CSTATUS) #define CSTATUS Control ('t') #endif @@ -327,7 +327,19 @@ list_entries (n) #endif ) { - printf ("%s ", this->ut_name); + char trimmed_name[sizeof (this->ut_name) + 1]; + int i; + + strncpy (trimmed_name, this->ut_name, sizeof (this->ut_name)); + trimmed_name[sizeof (this->ut_name)] = ' '; + for (i = 0; i <= sizeof (this->ut_name); i++) + { + if (trimmed_name[i] == ' ') + break; + } + trimmed_name[i] = '\0'; + + printf ("%s ", trimmed_name); entries++; } this++; |