merge with 1.9.2b

lib/getopt.c

@@ -20,6 +20,14 @@
    along with this program; if not, write to the Free Software
    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+/* 
+ * This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
+ * Ditto for AIX 3.2 and <stdlib.h>.
+ */
+#ifndef _NO_PROTO
+#define _NO_PROTO
+#endif
+
 #ifdef HAVE_CONFIG_H
 #if defined (emacs) || defined (CONFIG_BROKETS)
 /* We use <config.h> instead of "config.h" so that a compilation
@@ -39,11 +47,6 @@
 #endif
 #endif
 
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.  */
-#ifndef _NO_PROTO
-#define _NO_PROTO
-#endif
-
 #include <stdio.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not

lib/strftime.c

@@ -36,7 +36,6 @@
    Numeric modifiers (a nonstandard extension):
    -	do not pad the field
    _	pad the field with spaces
-   %s   time in seconds since 00:00:00, Jan 1, 1970
 
    Time fields:
    %H	hour (00..23)
@@ -47,7 +46,7 @@
    %p	locale's AM or PM
    %r	time, 12-hour (hh:mm:ss [AP]M)
    %R	time, 24-hour (hh:mm)
-   %s   time in seconds since 00:00:00, Jan 1, 1970 (a nonstandard extension)
+   %s	time in seconds since 00:00:00, Jan 1, 1970 (a nonstandard extension)
    %S	second (00..61)
    %T	time, 24-hour (hh:mm:ss)
    %X	locale's time representation (%H:%M:%S)

old/sh-utils/ChangeLog

@@ -1,3 +1,25 @@
+Tue Dec 28 15:49:32 1993  Jim Meyering  (meyering@comco.com)
+
+	* install.sh: New file.
+	Makefile.in [DISTFILES]: Add it.
+
+	* who.c (read_utmp): Use stdio functions instead of open/read/close
+	to avoid having to handle POSIX read's -1/errno=EINTR failure case.
+
+	* tee.c (tee): A POSIX implementation of the read system call
+	may return -1 and set errno to EINTR when it is interrupted.
+	Retry instead of failing with an error.
+	(tee): Don't use xwrite.  Use safe_write instead and include the
+	losing file name in the message reporting a write failure.
+	Don't treat standard output as a special case, so a failed write
+	to stdout doesn't exit immediately.
+
+Sat Dec 25 23:15:58 1993  Jim Meyering  (meyering@comco.com)
+
+	* who.c (main): Don't chdir ("/dev") for the stat in print_entry.
+	(print_entry): Instead of stat'ing the /dev-relative path, ut_line,
+	stat the absolute path with "/dev/" prefix.  From David MacKenzie.
+
 Wed Dec 22 00:53:51 1993  Jim Meyering  (meyering@comco.com)
 
 	* expr.c (toarith): Interpret the empty string as just that