merge with 3.5.5

17 files changed, 75 insertions, 18 deletions

diff --git a/src/chgrp.c b/src/chgrp.c
index 0102d7a10..65a0d4107 100644
--- 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 9e1b9832d..870f9f100 100644
--- 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 6fa8fbcff..7a2f4989f 100644
--- 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 81efbf437..8c2ba1ad3 100644
--- 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 3c89df6b8..323d72b67 100644
--- 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 3328bd6a3..fc3022670 100644
--- 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 a18ed4451..2aaf5130f 100644
--- 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 ce5ccadd5..b2461eefc 100644
--- 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 f9cb92ace..6981e22ed 100644
--- 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 f50b4efe6..6dd186a38 100644
--- 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 e9da99beb..360396b8d 100644
--- 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 dab49fad5..1a0e27e03 100644
--- 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 809820a6e..24930c1d3 100644
--- 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 d64f3e7ea..481c9534b 100644
--- 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 d0f98dad1..8d36853a8 100644
--- 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 a53235389..7302f25d4 100644
--- 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 efb45a1f6..583359162 100644
--- 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 ();