merge with 3.4.1

5 files changed, 8 insertions, 9 deletions

diff --git a/src/cp.c b/src/cp.c
index c1415b790..9eef69c9f 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -220,8 +220,7 @@ main (argc, argv)
 #ifdef S_ISLNK
 	  flag_symbolic_link = 1;
 #else
-	  error (0, 0, "symbolic links not supported; making hard links");
-	  flag_hard_link = 1;
+	  error (1, 0, "symbolic links are not supported on this system");
 #endif
 	  break;
 
diff --git a/src/df.c b/src/df.c
index 88f7d043d..994987f3f 100644
--- a/src/df.c
+++ b/src/df.c
@@ -442,7 +442,7 @@ usage ()
 {
   fprintf (stderr, "\
 Usage: %s [-aikPv] [-t fstype] [-x fstype] [--all] [--inodes]\n\
-\t[--type fstype] [--exclude-type fstype] [--kilobytes] [--portability]\n\
+\t[--type=fstype] [--exclude-type=fstype] [--kilobytes] [--portability]\n\
 \t[path...]\n",
 	   program_name);
   exit (1);
diff --git a/src/ln.c b/src/ln.c
index ea8d3b2f3..3907399ee 100644
--- a/src/ln.c
+++ b/src/ln.c
@@ -122,7 +122,7 @@ main (argc, argv)
 #ifdef S_ISLNK
 	  symbolic_link = 1;
 #else
-	  error (0, 0, "symbolic links not supported; making hard links");
+	  error (1, 0, "symbolic links are not supported on this system");
 #endif
 	  break;
 	case 'v':
diff --git a/src/ls.c b/src/ls.c
index c26b91f92..38cdd252d 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -214,7 +214,7 @@ enum time_type
 
 static enum time_type time_type;
 
-/* print the full time, -T, otherwise the standard unix heuristics. */
+/* print the full time, -f, otherwise the standard unix heuristics. */
 
 int full_time;
 
@@ -777,7 +777,7 @@ print_dir (name, realname)
      char *realname;
 {
   register DIR *reading;
-  register struct direct *next;
+  register struct dirent *next;
   register int total_blocks = 0;
 
   errno = 0;
@@ -852,7 +852,7 @@ add_ignore_pattern (pattern)
 
 static int
 file_interesting (next)
-     register struct direct *next;
+     register struct dirent *next;
 {
   register struct ignore_pattern *ignore;
 
diff --git a/src/rm.c b/src/rm.c
index 7e711dd99..4b6c2d2eb 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -134,7 +134,7 @@ main (argc, argv)
       if (ignore_missing_files)
 	exit (0);
       else
-    usage ();
+	usage ();
     }
 
   stdin_tty = isatty (0);
@@ -320,7 +320,7 @@ clear_directory (statp)
      struct stat *statp;
 {
   DIR *dirp;
-  struct direct *dp;
+  struct dirent *dp;
   char *name_space;		/* Copy of directory's filenames. */
   char *namep;			/* Current entry in `name_space'. */
   unsigned name_size;		/* Bytes allocated for `name_space'. */