merge with 3.5.5

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 2a1fe86c75d5f93571f2f1b501626af53bcd4a24..c9ed26c878c23618f565367c8ba70a8bf85ffc1a 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -156,9 +156,11 @@ get_fs_usage (path, disk, fsp)
      no matter what value f_bsize has.  */
 #define convert_blocks(b) (b)
 #ifndef _SEQUENT_              /* _SEQUENT_ is DYNIX/ptx.  */
+#ifndef DOLPHIN                        /* DOLPHIN 3.8.alfa/7.18 has f_bavail */
 #define f_bavail f_bfree
 #endif
 #endif
+#endif
 
 #ifdef STAT_STATVFS            /* SVR4.  */
   struct statvfs fsd;

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 210d5e160dff74c06578dcef90e97e46044ede40..b6e5eaebf222e6afc629776ecb196d3cb592f3d7 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,14 +1,42 @@
-Wed May 12 20:48:55 1993  Jim Meyering (meyering@comco.com)
+Fri May 21 18:42:27 1993  Jim Meyering  (meyering@comco.com)
+
+       * rename.c (rename): Be careful not to unlink `from' if it happens
+       to be equal to `to' or (on filesystems that silently truncate
+       filenames after 14 characters) if `from' and `to' share the
+       significant characters.  From Bruno Haible
+       <haible@ma2s2.mathematik.uni-karlsruhe.de>.
+
+       * mountlist.c, fsusage.c: Make these work under m88k DolphinOS.
+       From Kjetil Wiekhorst J|rgensen <jorgens@pvv.unit.no>.
+
+Tue May 18 23:49:26 1993  Jim Meyering  (meyering@comco.com)
+
+       * mkinstalldirs: New file.
+       * Makefile.in (installdirs): Use it.
+
+Sat May 15 01:20:26 1993  Jim Meyering  (meyering@comco.com)
+
+       * ln.c (do_link): Make `ln -s dir_pathname .' work when the
+       pathname has a trailing slash.
+
+Fri May 14 23:45:52 1993  Jim Meyering  (meyering@comco.com)
+
+       * all source: With --version, print version and exit immediately.
+
+Wed May 12 20:48:55 1993  Jim Meyering  (meyering@comco.com)
 
        * configure.in: Add check for the -ldgc library that is required
        for getmntent on m88k DGUX-5.4 systems.
 
-Sat May  8 11:31:14 1993  Jim Meyering (meyering@comco.com)
+       * Makefile.in (installdirs): New rules for creating installation
+       directories. (install): depend on it.
+
+Sat May  8 11:31:14 1993  Jim Meyering  (meyering@comco.com)
 
        * lib/Makefile.in (dist): Use `cp -p' instead of just `cp'
        if linking fails.
 
-Thu May  6 22:45:25 1993  Jim Meyering (meyering@comco.com)
+Thu May  6 22:45:25 1993  Jim Meyering  (meyering@comco.com)
 
        * makepath.c: Use explicit dcl of errno only if !STDC_HEADERS.
        Some systems have <errno.h> but don't declare errno.
@@ -16,12 +44,12 @@ Thu May  6 22:45:25 1993  Jim Meyering (meyering@comco.com)
 
        * getdate.y: Test TIME_WITH_SYS_TIME, not TIME_AND_SYS_TIME.
 
-Wed May  5 00:21:12 1993  Jim Meyering (meyering@comco.com)
+Wed May  5 00:21:12 1993  Jim Meyering  (meyering@comco.com)
 
        * configure.in: Add AC_TIME_WITH_SYS_TIME.
        * getdate.y: Use it (this is a version local to fileutils).
 
-Tue May  4 20:25:41 1993  Jim Meyering (meyering@comco.com)
+Tue May  4 20:25:41 1993  Jim Meyering  (meyering@comco.com)
 
        * du.c (count_entry): Give an error and exit if chdir ("..") fails.
        From Bruce Evans <bde@runx.oz.AU>.
@@ -29,25 +57,25 @@ Tue May  4 20:25:41 1993  Jim Meyering (meyering@comco.com)
        * eaccess (eaccess_stat): Cast NGROUPS_MAX to appropriate types.
        From Bruce Evans <bde@runx.oz.AU>.
 
-Mon May  3 22:09:24 1993  Jim Meyering (meyering@comco.com)
+Mon May  3 22:09:24 1993  Jim Meyering  (meyering@comco.com)
 
        * configure.in: Add AC_GETGROUPS_T.
        * eaccess.c: Don't define GETGROUPS_T.  Now configure does it.
 
-Sun May  2 09:18:53 1993  Jim Meyering (meyering@comco.com)
+Sun May  2 09:18:53 1993  Jim Meyering  (meyering@comco.com)
 
        * configure.in: Check for libypsec.a on Dolphin M88K machines.
        This can result in significant speedup for programs that access
        YP information.  From Kjetil Wiekhorst J{\o}rgensen
        <jorgens@pvv.unit.no>.
 
-Fri Apr 30 02:21:48 1993  Jim Meyering (meyering@comco.com)
+Fri Apr 30 02:21:48 1993  Jim Meyering  (meyering@comco.com)
 
        * ls.c (main): Make `-f' work like on standard Unix ls, instead
        of as a short equivalent of --full-time.
        * ls.1: Document it.
 
-Thu Apr 29 00:46:46 1993  Jim Meyering (meyering@comco.com)
+Thu Apr 29 00:46:46 1993  Jim Meyering  (meyering@comco.com)
 
        * src/Makefile.in [dir.o, vdir.o]: Make ordering of CFLAGS etc
        in compilation rules consistent with that in .c.o rule.
@@ -56,11 +84,11 @@ Thu Apr 29 00:46:46 1993  Jim Meyering (meyering@comco.com)
        Makefile.in (like adding new files to DISTRIB) are reflected
        in the new distribution.
 
-Tue Apr 27 21:35:11 1993  Jim Meyering (meyering@comco.com)
+Tue Apr 27 21:35:11 1993  Jim Meyering  (meyering@comco.com)
 
        * configure.in: Remove unnecessary AC_PROG_INSTALL.
 
-Fri Apr 23 23:39:16 1993  Jim Meyering (meyering@comco.com)
+Fri Apr 23 23:39:16 1993  Jim Meyering  (meyering@comco.com)
 
        * {lib,src}/Makefile.in [.c.o]: Make CPPFLAGS and CFLAGS follow
        other options so users can use them to override DEFS.
@@ -69,7 +97,7 @@ Fri Apr 23 23:39:16 1993  Jim Meyering (meyering@comco.com)
        libc-subst.  `touch' built with the latter didn't set proper
        time unless given a specific --date option.
 
-Thu Apr 22 00:22:25 1993  Jim Meyering (meyering@comco.com)
+Thu Apr 22 00:22:25 1993  Jim Meyering  (meyering@comco.com)
 
        * makepath.c: Decouple inclusion of errno.h from definition of
        STDC_HEADERS; many systems have errno.h, yet shouldn't define
@@ -78,7 +106,7 @@ Thu Apr 22 00:22:25 1993  Jim Meyering (meyering@comco.com)
        EPERM are defined.
        * configure.in: Test for errno.h header file.
 
-Mon Apr 19 11:21:14 1993  Jim Meyering (meyering@comco.com)
+Mon Apr 19 11:21:14 1993  Jim Meyering  (meyering@comco.com)
 
        * Version 3.5.
 
@@ -104,7 +132,7 @@ Sun Apr 18 22:40:19 1993  David J. MacKenzie  (djm@kropotkin.gnu.ai.mit.edu)
        * configure.in: Fix test for 4.4BSD statfs to not grep for a
        macro in cpp output.
 
-Sun Apr 18 02:35:36 1993  Jim Meyering (meyering@comco.com)
+Sun Apr 18 02:35:36 1993  Jim Meyering  (meyering@comco.com)
 
        * configure.in: Check for gettimeofday.
        Check for `struct tm'.
@@ -118,7 +146,7 @@ Sun Apr 18 02:35:36 1993  Jim Meyering (meyering@comco.com)
        mvdir so that it doesn't cause gratuitous failures with broken shells.
        Split long rule so the pieces fit in 80-column lines. 
 
-Thu Apr 15 23:44:01 1993  Jim Meyering (meyering@comco.com)
+Thu Apr 15 23:44:01 1993  Jim Meyering  (meyering@comco.com)
 
        * lib/Makefile.in (posixtm.c): Add dependency on getdate.c to enforce
        sequential invocations of YACC.
@@ -127,7 +155,7 @@ Thu Apr 15 23:44:01 1993  Jim Meyering (meyering@comco.com)
        won't be run in parallel;  now bison (when used) is always invoked
        with -y.
 
-Tue Apr 13 09:18:18 1993  Jim Meyering (meyering@comco.com)
+Tue Apr 13 09:18:18 1993  Jim Meyering  (meyering@comco.com)
 
        * configure.in: Find a parser generator.
        * Makefile.in [MDEFINES]: Add YACC to the list of variables passed to
@@ -141,7 +169,7 @@ Tue Apr 13 09:18:18 1993  Jim Meyering (meyering@comco.com)
 
        * configure.in: Add tests for memcpy and bcopy.
 
-Mon Apr 12 23:02:14 1993  Jim Meyering (meyering@comco.com)
+Mon Apr 12 23:02:14 1993  Jim Meyering  (meyering@comco.com)
 
        * configure.in (mounted, space): Add filesystem checks for DEC Alpha
        running OSF/1 to complement new code in mountlist.c and fsusage.c.
@@ -153,17 +181,17 @@ Mon Apr 12 23:02:14 1993  Jim Meyering (meyering@comco.com)
        * lib/fsusage.c (get_fs_usage) [STATFS_OSF1]: Add code to call OSF/1's
        variant of statfs.  From Brian Fox (bfox@tinker.crseo.ucsb.edu).
 
-Sun Apr 11 20:29:31 1993  Jim Meyering (meyering@comco.com)
+Sun Apr 11 20:29:31 1993  Jim Meyering  (meyering@comco.com)
 
        * df.c (main, show_dev): Don't list dummy (automounter) filesystems
        unless they're explicitly listed on the command line or if the -a
        option is given.
 
-Fri Apr  9 11:40:48 1993  Jim Meyering (meyering@comco.com)
+Fri Apr  9 11:40:48 1993  Jim Meyering  (meyering@comco.com)
 
        * src/Makefile.in [.c.o]: Put CFLAGS after include directives.
 
-Wed Apr  7 23:54:48 1993  Jim Meyering (meyering@comco.com)
+Wed Apr  7 23:54:48 1993  Jim Meyering  (meyering@comco.com)
 
        * eaccess.c: Undefine NGROUPS_MAX before redefining it.
        From ghazi@caip.rutgers.edu (Kaveh R. Ghazi).
@@ -705,7 +733,7 @@ Thu Oct 24 23:50:46 1991  David J. MacKenzie  (djm at wookumz.gnu.ai.mit.edu)
        * chown.c (change_file_owner), chgrp.c (change_file_group):
        don't skip symlinks, since the chown system call works on them.
 
-Fri 18 Oct 1991 23:29:24  Jim Meyering (meyering at wombat)
+Fri 18 Oct 1991 23:29:24  Jim Meyering  (meyering at wombat)
 
        * configure: fixed test to detect sequent's strange interpretation
        of utime(file, NULL).
@@ -778,12 +806,12 @@ Wed Aug 21 13:03:14 1991  David J. MacKenzie  (djm at wookumz.gnu.ai.mit.edu)
        like Sequents.
        * configure: Check sys/dir.h for 'void closedir'.
 
-Tue Aug 20 22:22:47 1991  Jim Meyering (meyering at nutrimat)
+Tue Aug 20 22:22:47 1991  Jim Meyering  (meyering at nutrimat)
 
        * mvdir.c (main):  Clean up loop to stat component
        directories -- as in makepath and pathchk.
 
-Tue Aug 20 22:10:47 1991  Jim Meyering (meyering at nutrimat)
+Tue Aug 20 22:10:47 1991  Jim Meyering  (meyering at nutrimat)
 
        * dirname.c (dirname):  Allocate exact amount of space
        needed for result.

diff --git a/old/fileutils/NEWS b/old/fileutils/NEWS
index 590577c1bb580a742815bbd741eac9654435aca3..487e1d1656feda2eb7bb5873d48ccc93824b2ca1 100644 (file)
--- a/old/fileutils/NEWS
+++ b/old/fileutils/NEWS
@@ -1,4 +1,6 @@
 Major changes in release 3.6:
+* `ln -s dir_pathname .' works when the pathname has a trailing slash
+* with the --version option programs print the version and exit immediately
 * GNU ls -f works like Unix ls -f
 * mktime replacement works
 \f

diff --git a/src/chgrp.c b/src/chgrp.c
index 0102d7a1014cb369b3036ffff5937ff70c2da33d..65a0d41075ede5dbf1344489db86e4205b3f7f92 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -128,7 +128,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/chmod.c b/src/chmod.c
index 9e1b9832dfc117b14add5270f2e814593d66ae3b..870f9f100cd0f49a1f4d2dfbbb2dac0ab7887670 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -143,7 +143,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/chown.c b/src/chown.c
index 6fa8fbcff785caf3cc1fd06a91c789e32d0d852d..7a2f4989fa140c90bad547e3a8d11e0addcad3ae 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -140,7 +140,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/cp.c b/src/cp.c
index 81efbf43799dc74c23b428d02f15900db943af5a..8c2ba1ad3f90f069dc342bcaac7e8851c8140cbc 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -259,7 +259,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage (NULL);

diff --git a/src/dd.c b/src/dd.c
index 3c89df6b82dbf4be2cddbf7aea4eeba3d50a7827..323d72b67fef9bd00fc37e4881d8918b0dbfb1c6 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -341,7 +341,10 @@ main (argc, argv)
   scanargs (argc, argv);
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/df.c b/src/df.c
index 3328bd6a36d7ef24d22227290fb594f2d9aaf97a..fc30226704def8abd6e2eb418196365c9ce7a69b 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -179,7 +179,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/du.c b/src/du.c
index a18ed4451ab71d6a91ecbf507313cc5267bf78b8..2aaf5130fcbf6b1eb5f68b42b85460e29f2fd5b4 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -259,7 +259,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage (NULL);

diff --git a/src/install.c b/src/install.c
index ce5ccadd5410ad568a356585ece7309f58db8cf3..b2461eefcb9a830ce5f3f5ebd95bf6398237e1f2 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -197,7 +197,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/ln.c b/src/ln.c
index f9cb92ace35312ce59d3b7c939d351284e442a3a..6981e22ed4ee62f5f3a63f0da9ae687cfb36b9b1 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -38,6 +38,7 @@ enum backup_type get_version ();
 int isdir ();
 int yesno ();
 void error ();
+void strip_trailing_slashes ();
 
 static void usage ();
 static int do_link ();
@@ -150,7 +151,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();
@@ -212,8 +216,13 @@ do_link (source, dest)
       /* Target is a directory; build the full filename. */
       char *new_dest;
       char *source_base;
+      char *tmp_source;
+
+      tmp_source = (char *) alloca (strlen (source) + 1);
+      strcpy (tmp_source, source);
+      strip_trailing_slashes (tmp_source);
 
-      source_base = basename (source);
+      source_base = basename (tmp_source);
       new_dest = (char *)
        alloca (strlen (source_base) + 1 + strlen (dest) + 1);
       sprintf (new_dest, "%s/%s", dest, source_base);

diff --git a/src/ls.c b/src/ls.c
index f50b4efe66f282b56163574817af624e10231b15..6dd186a3864e2152a874a0a9eca6a2744835b065 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -445,7 +445,10 @@ main (argc, argv)
   i = decode_switches (argc, argv);
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/mkdir.c b/src/mkdir.c
index e9da99beb11b0769de3f93126a374e6e28b8e93f..360396b8d9c9d09d1a85bc446cb36ea0ba123e3c 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -92,7 +92,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/mkfifo.c b/src/mkfifo.c
index dab49fad55e1dce4ab98c19fb36f007919e87467..1a0e27e03e318169adc12268b5fd49a386d73276 100644 (file)
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -82,7 +82,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/mknod.c b/src/mknod.c
index 809820a6eb54a5b7738ac3c47fc8020745598f21..24930c1d34df69782db2d7e0313127fb6c7f70a0 100644 (file)
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -83,7 +83,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/mv.c b/src/mv.c
index d64f3e7eaa32e1eacd4e0e391874f1b7d2804d61..481c9534bb7e51aa06625a7005fc060ae933de40 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -162,7 +162,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/rm.c b/src/rm.c
index d0f98dad1f8aac1c919d6b889de9d10641b1fcda..8d36853a81d3d3268de36928b510f85f82b97aa8 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -139,7 +139,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/rmdir.c b/src/rmdir.c
index a53235389264b1b0889b2e13fa5b90315aca8802..7302f25d45980d355c547704abf706decf32d0d3 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -80,7 +80,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();

diff --git a/src/touch.c b/src/touch.c
index efb45a1f6d472012afa0bec16ceb13bd39f0d92e..5833591620c63a5efe4e5131c8d7cb44f216ec3c 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -194,7 +194,10 @@ main (argc, argv)
     }
 
   if (flag_version)
-    fprintf (stderr, "%s\n", version_string);
+    {
+      fprintf (stderr, "%s\n", version_string);
+      exit (0);
+    }
 
   if (flag_help)
     usage ();