merge with 3.9b

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 8ae23424340e748dc56271f9b4f27a8b7b452605..ab9157e601888413d1c59df353a87fde8f500e6c 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 18 00:03:24 1993  Jim Meyering  (meyering@comco.com)
+
+       * configure.in [STAT_STATFS2_FSIZE]: Fix test (that had obsolete
+       and now-broken use of AC_HEADER_EGREP) so that this flag is set
+       for NetBSD 0.9.
+
 Mon Oct 25 20:27:00 1993  Jim Meyering  (meyering@comco.com)
 
        * cp-aux.c, df.c, install.c, ln.c, ls.c, mkdir.c, mkfifo.c,

diff --git a/src/ls.c b/src/ls.c
index adfe143fbb5bd4d4300af61ae9cf713ded8c4a14..e0aece50ee9414bccf0adcc5a8c0c3f8c362e6f2 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -1480,7 +1480,7 @@ print_long_format (f)
     printf ("%3u, %3u ", (unsigned) major (f->stat.st_rdev),
            (unsigned) minor (f->stat.st_rdev));
   else
-    printf ("%8lu ", f->stat.st_size);
+    printf ("%8lu ", (unsigned long) f->stat.st_size);
 
   printf ("%s ", full_time ? timebuf : timebuf + 4);
 

diff --git a/src/mv.c b/src/mv.c
index a79da4b86b0d4441c06b8c024d27c78e94c13fdd..bec6939e45fafc0f64e69734e0efb68b5a8681e5 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -189,7 +189,7 @@ main (argc, argv)
   if (make_backups)
     backup_type = get_version (version);
 
-  stdin_tty = isatty (0);
+  stdin_tty = isatty (STDIN_FILENO);
 
   if (argc > optind + 2 && !isdir (argv[argc - 1]))
     error (1, 0, "when moving multiple files, last argument must be a directory");

diff --git a/src/rm.c b/src/rm.c
index bae9e95b3a17c4e04ee3face010580a42240cb07..722994735d7fbba8bae0fa10e0da13bf8a3dd40f 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -166,7 +166,7 @@ main (argc, argv)
        usage (1);
     }
 
-  stdin_tty = isatty (0);
+  stdin_tty = isatty (STDIN_FILENO);
 
   for (; optind < argc; optind++)
     {