From: Jim Meyering <jim@meyering.net>
Date: Fri, 17 Dec 1993 23:12:34 +0000 (+0000)
Subject: merge with 3.9b
X-Git-Tag: textutils-1_12_1~795
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4c0b38042e53ad649228b02842790250f7faf54;p=thirdparty%2Fcoreutils.git

merge with 3.9b
---

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 8ae2342434..ab9157e601 100644
--- 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 adfe143fbb..e0aece50ee 100644
--- 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 a79da4b86b..bec6939e45 100644
--- 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 bae9e95b3a..722994735d 100644
--- 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++)
     {