2008-04-12 Chris Johns <chrisj@rtems.org>

	* libmisc/shell/shell.c, libmisc/shell/shell.h,
	libmisc/shell/shell_script.c: Add support to echo the commands to
	stdout. This is useful with the -v script option to show commands
	as the run. Also added support to chdir to the directory the task
	invoking the script is in.
	* libmisc/shell/extern-cp.h, libmisc/shell/main_cp.c,
	libmisc/shell/utils-cp.c: Update tro the latest FreeBSD version.
	* libcsupport/Makefile.am, libcsupport/src/fchown.c: Add fchown
	support.

1 files changed, 411 insertions, 396 deletions

diff --git a/cpukit/libmisc/shell/main_cp.c b/cpukit/libmisc/shell/main_cp.c
index 7b48c47f71..3111a4db74 100644
--- a/cpukit/libmisc/shell/main_cp.c
+++ b/cpukit/libmisc/shell/main_cp.c
@@ -73,23 +73,26 @@ __RCSID("$NetBSD: cp.c,v 1.39 2005/10/24 12:59:07 kleink Exp $");
 #include <err.h>
 #include <errno.h>
 #include <fts.h>
-#include <locale.h>
-#include <stdlib.h>
+#include <limits.h>
+#include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "extern-cp.h"
 
-#define  STRIP_TRAILING_SLASH(p) {                              \
-    while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] == '/')  \
-      *--(p).p_end = '\0';                                      \
-  }
+#define S_ISTXT 0
 
-static char empty[] = "";
+#define	STRIP_TRAILING_SLASH(p) {					\
+        while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] == '/')	\
+                *--(p).p_end = 0;					\
+}
 
 enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
 
+static int Rflag, rflag;
+
 static int main_cp(rtems_shell_cp_globals* cp_globals, int, char *[]);
 static int copy(rtems_shell_cp_globals* cp_globals, char *[], enum op, int);
 static int mastercmp(const FTSENT **, const FTSENT **);
@@ -105,6 +108,7 @@ rtems_shell_main_cp(int argc, char *argv[])
 {
   rtems_shell_cp_globals cp_globals;
   memset (&cp_globals, 0, sizeof (cp_globals));
+  Rflag = rflag = 0;
   if (setjmp (cp_globals.exit_jmp) == 0)
     return main_cp (&cp_globals, argc, argv);
   return 1;
@@ -113,169 +117,166 @@ rtems_shell_main_cp(int argc, char *argv[])
 int
 main_cp(rtems_shell_cp_globals* cp_globals, int argc, char *argv[])
 {
-  struct stat to_stat, tmp_stat;
-  enum op type;
-  int Hflag, Lflag, Pflag, ch, fts_options, r;
-  char *target;
+	struct stat to_stat, tmp_stat;
+	enum op type;
+	int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash;
+	char *target;
   struct getopt_data getopt_reent;
 
-  to.p_end = to.p_path;
-  to.target_end = empty;
-
-  (void)setlocale(LC_ALL, "");
-
-  Hflag = Lflag = Pflag = Rflag = 0;
+	Hflag = Lflag = Pflag = 0;
   memset(&getopt_reent, 0, sizeof(getopt_data)); 
 
-  while ((ch = getopt_r(argc, argv, "HLNPRfiprv", &getopt_reent)) != -1) 
-    switch (ch) {
-      case 'H':
-        Hflag = 1;
-        Lflag = Pflag = 0;
-        break;
-      case 'L':
-        Lflag = 1;
-        Hflag = Pflag = 0;
-        break;
-      case 'N':
-        Nflag = 1;
-        break;
-      case 'P':
-        Pflag = 1;
-        Hflag = Lflag = 0;
-        break;
-      case 'R':
-        Rflag = 1;
-        break;
-      case 'f':
-        fflag = 1;
-        iflag = 0;
-        break;
-      case 'i':
-        iflag = isatty(fileno(stdin));
-        fflag = 0;
-        break;
-      case 'p':
-        pflag = 1;
-        break;
-      case 'r':
-        rflag = 1;
-        break;
-      case 'v':
-        vflag = 1;
-        break;
-      case '?':
-      default:
-        usage();
-        return 1;
-    }
-  argc -= optind;
-  argv += optind;
-
-  if (argc < 2)
-    usage();
-
-  fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
-  if (rflag) {
-    if (Rflag) {
-      errx(exit_jump, EXIT_FAILURE,
-           "the -R and -r options may not be specified together.");
-      /* NOTREACHED */
-    }
-    if (Hflag || Lflag || Pflag) {
-      errx(exit_jump, EXIT_FAILURE,
-           "the -H, -L, and -P options may not be specified with the -r option.");
-      /* NOTREACHED */
-    }
-    fts_options &= ~FTS_PHYSICAL;
-    fts_options |= FTS_LOGICAL;
-  }
-  if (Rflag) {
-    if (Hflag)
-      fts_options |= FTS_COMFOLLOW;
-    if (Lflag) {
-      fts_options &= ~FTS_PHYSICAL;
-      fts_options |= FTS_LOGICAL;
-    }
-  } else {
-    fts_options &= ~FTS_PHYSICAL;
-    fts_options |= FTS_LOGICAL | FTS_COMFOLLOW;
-  }
-
-  myuid = getuid();
-
-  /* Copy the umask for explicit mode setting. */
-  myumask = umask(0);
-  (void)umask(myumask);
-
-  /* Save the target base in "to". */
-  target = argv[--argc];
-  if (strlen(target) > MAXPATHLEN) {
-    errx(exit_jump, EXIT_FAILURE, "%s: name too long", target);
-    /* NOTREACHED */
-  }
-  (void)strcpy(to.p_path, target);
-  to.p_end = to.p_path + strlen(to.p_path);
-  STRIP_TRAILING_SLASH(to);
-  to.target_end = to.p_end;
-
-  /* Set end of argument list for fts(3). */
-  argv[argc] = NULL;     
+	while ((ch = getopt_r(argc, argv, "HLPRafilnprv", &getopt_reent)) != -1)
+		switch (ch) {
+		case 'H':
+			Hflag = 1;
+			Lflag = Pflag = 0;
+			break;
+		case 'L':
+			Lflag = 1;
+			Hflag = Pflag = 0;
+			break;
+		case 'P':
+			Pflag = 1;
+			Hflag = Lflag = 0;
+			break;
+		case 'R':
+			Rflag = 1;
+			break;
+		case 'a':
+			Pflag = 1;
+			pflag = 1;
+			Rflag = 1;
+			Hflag = Lflag = 0;
+			break;
+		case 'f':
+			fflag = 1;
+			iflag = nflag = 0;
+			break;
+		case 'i':
+			iflag = 1;
+			fflag = nflag = 0;
+			break;
+		case 'l':
+			lflag = 1;
+			break;
+		case 'n':
+			nflag = 1;
+			fflag = iflag = 0;
+			break;
+		case 'p':
+			pflag = 1;
+			break;
+		case 'r':
+			rflag = Lflag = 1;
+			Hflag = Pflag = 0;
+			break;
+		case 'v':
+			vflag = 1;
+			break;
+		default:
+			usage();
+			break;
+		}
+	argc -= getopt_reent.optind;
+	argv += getopt_reent.optind;
+
+	if (argc < 2)
+		usage();
+
+	fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
+	if (Rflag && rflag)
+		errx(exit_jump, 1, "the -R and -r options may not be specified together");
+	if (rflag)
+		Rflag = 1;
+	if (Rflag) {
+		if (Hflag)
+			fts_options |= FTS_COMFOLLOW;
+		if (Lflag) {
+			fts_options &= ~FTS_PHYSICAL;
+			fts_options |= FTS_LOGICAL;
+		}
+	} else {
+		fts_options &= ~FTS_PHYSICAL;
+		fts_options |= FTS_LOGICAL | FTS_COMFOLLOW;
+	}
+#if 0
+	(void)signal(SIGINFO, siginfo);
+#endif
   
-  /*
-   * Cp has two distinct cases:
-   *
-   * cp [-R] source target
-   * cp [-R] source1 ... sourceN directory
-   *
-   * In both cases, source can be either a file or a directory.
-   *
-   * In (1), the target becomes a copy of the source. That is, if the
-   * source is a file, the target will be a file, and likewise for
-   * directories.
-   *
-   * In (2), the real target is not directory, but "directory/source".
-   */
-  r = stat(to.p_path, &to_stat);
-  if (r == -1 && errno != ENOENT) {
-    err(exit_jump, EXIT_FAILURE, "%s", to.p_path);
-    /* NOTREACHED */
-  }
-  if (r == -1 || !S_ISDIR(to_stat.st_mode)) {
-    /*
-     * Case (1).  Target is not a directory.
-     */ 
-    if (argc > 1)
-      usage();
-    /*
-     * Need to detect the case:
-     *  cp -R dir foo
-     * Where dir is a directory and foo does not exist, where
-     * we want pathname concatenations turned on but not for
-     * the initial mkdir().
-     */
-    if (r == -1) {
-      if (rflag || (Rflag && (Lflag || Hflag)))
-        r = stat(*argv, &tmp_stat);
-      else
-        r = lstat(*argv, &tmp_stat);
-      if (r == -1) {
-        err(exit_jump, EXIT_FAILURE, "%s", *argv);
-        /* NOTREACHED */
-      }
-      
-      if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag))
-        type = DIR_TO_DNE;
-      else
-        type = FILE_TO_FILE;
-    } else
-      type = FILE_TO_FILE;
-  } else {
-    /*
-     * Case (2).  Target is a directory.
-     */
-    type = FILE_TO_DIR;
-  }
+	/* Save the target base in "to". */
+	target = argv[--argc];
+	if (strlcpy(to.p_path, target, sizeof(to.p_path)) >= sizeof(to.p_path))
+		errx(exit_jump, 1, "%s: name too long", target);
+	to.p_end = to.p_path + strlen(to.p_path);
+        if (to.p_path == to.p_end) {
+		*to.p_end++ = '.';
+		*to.p_end = 0;
+	}
+	have_trailing_slash = (to.p_end[-1] == '/');
+	if (have_trailing_slash)
+		STRIP_TRAILING_SLASH(to);
+	to.target_end = to.p_end;
+
+	/* Set end of argument list for fts(3). */
+	argv[argc] = NULL;
+
+	/*
+	 * Cp has two distinct cases:
+	 *
+	 * cp [-R] source target
+	 * cp [-R] source1 ... sourceN directory
+	 *
+	 * In both cases, source can be either a file or a directory.
+	 *
+	 * In (1), the target becomes a copy of the source. That is, if the
+	 * source is a file, the target will be a file, and likewise for
+	 * directories.
+	 *
+	 * In (2), the real target is not directory, but "directory/source".
+	 */
+	r = stat(to.p_path, &to_stat);
+	if (r == -1 && errno != ENOENT)
+		err(exit_jump, 1, "%s", to.p_path);
+	if (r == -1 || !S_ISDIR(to_stat.st_mode)) {
+		/*
+		 * Case (1).  Target is not a directory.
+		 */
+		if (argc > 1)
+			errx(exit_jump, 1, "%s is not a directory", to.p_path);
+
+		/*
+		 * Need to detect the case:
+		 *	cp -R dir foo
+		 * Where dir is a directory and foo does not exist, where
+		 * we want pathname concatenations turned on but not for
+		 * the initial mkdir().
+		 */
+		if (r == -1) {
+			if (Rflag && (Lflag || Hflag))
+				stat(*argv, &tmp_stat);
+			else
+				lstat(*argv, &tmp_stat);
+
+			if (S_ISDIR(tmp_stat.st_mode) && Rflag)
+				type = DIR_TO_DNE;
+			else
+				type = FILE_TO_FILE;
+		} else
+			type = FILE_TO_FILE;
+
+		if (have_trailing_slash && type == FILE_TO_FILE) {
+			if (r == -1)
+				errx(exit_jump, 1, "directory %s does not exist",
+				     to.p_path);
+			else
+				errx(exit_jump, 1, "%s is not a directory", to.p_path);
+		}
+	} else
+		/*
+		 * Case (2).  Target is a directory.
+		 */
+		type = FILE_TO_DIR;
 
   return copy(cp_globals, argv, type, fts_options);
 }
@@ -284,245 +285,258 @@ int
 copy(rtems_shell_cp_globals* cp_globals,
      char *argv[], enum op type, int fts_options)
 {
-  struct stat to_stat;
-  FTS *ftsp;
-  FTSENT *curr;
-  int base, dne, rval;
-  size_t nlen;
-  char *p, *tmp;
-
-  base = 0;  /* XXX gcc -Wuninitialized (see comment below) */
-
-  if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
-    err(exit_jump, EXIT_FAILURE, "%s", argv[0]);
-  /* NOTREACHED */
-  for (rval = 0; (curr = fts_read(ftsp)) != NULL;) {
-    switch (curr->fts_info) {
-      case FTS_NS:
-      case FTS_DNR:
-      case FTS_ERR:
-        warnx("%s: %s", curr->fts_path,
-              strerror(curr->fts_errno));
-        rval = 1;
-        continue;
-      case FTS_DC:      /* Warn, continue. */
-        warnx("%s: directory causes a cycle", curr->fts_path);
-        rval = 1;
-        continue;
-    }
-
-    /*
-     * If we are in case (2) or (3) above, we need to append the 
-     * source name to the target name.  
-     */
-    if (type != FILE_TO_FILE) {
-      if ((curr->fts_namelen +
-           to.target_end - to.p_path + 1) > MAXPATHLEN) {
-        warnx("%s/%s: name too long (not copied)",
-              to.p_path, curr->fts_name);
-        rval = 1;
-        continue;
-      }
-
-      /*
-       * Need to remember the roots of traversals to create
-       * correct pathnames.  If there's a directory being
-       * copied to a non-existent directory, e.g.
-       *  cp -R a/dir noexist
-       * the resulting path name should be noexist/foo, not
-       * noexist/dir/foo (where foo is a file in dir), which
-       * is the case where the target exists.
-       *
-       * Also, check for "..".  This is for correct path
-       * concatentation for paths ending in "..", e.g.
-       *  cp -R .. /tmp
-       * Paths ending in ".." are changed to ".".  This is
-       * tricky, but seems the easiest way to fix the problem.
-       *
-       * XXX
-       * Since the first level MUST be FTS_ROOTLEVEL, base
-       * is always initialized.
-       */
-      if (curr->fts_level == FTS_ROOTLEVEL) {
-        if (type != DIR_TO_DNE) {
-          p = strrchr(curr->fts_path, '/');
-          base = (p == NULL) ? 0 : 
-            (int)(p - curr->fts_path + 1);
-
-          if (!strcmp(&curr->fts_path[base], 
-                      ".."))
-            base += 1;
-        } else
-          base = curr->fts_pathlen;
-      }
-
-      p = &curr->fts_path[base];
-      nlen = curr->fts_pathlen - base;
-
-      tmp = to.target_end;
-      if (*p != '/' && *(tmp - 1) != '/')
-        *tmp++ = '/';
-      *tmp = 0;
-
-      (void)strncat(tmp, p, nlen);
-      to.p_end = tmp + nlen;
-      *to.p_end = 0;
-      STRIP_TRAILING_SLASH(to);
-    }
-
-    /* Not an error but need to remember it happened */
-    if (stat(to.p_path, &to_stat) == -1)
-      dne = 1;
-    else {
-      if (to_stat.st_dev == curr->fts_statp->st_dev &&
-          to_stat.st_ino == curr->fts_statp->st_ino) {
-        warnx("%s and %s are identical (not copied).",
-              to.p_path, curr->fts_path);
-        rval = 1;
-        if (S_ISDIR(curr->fts_statp->st_mode))
-          (void)fts_set(ftsp, curr, FTS_SKIP);
-        continue;
-      }
-      if (!S_ISDIR(curr->fts_statp->st_mode) &&
-          S_ISDIR(to_stat.st_mode)) {
-        warnx("cannot overwrite directory %s with non-directory %s",
-              to.p_path, curr->fts_path);
-        rval = 1;
-        continue;
-      }
-      dne = 0;
-    }
-
-    switch (curr->fts_statp->st_mode & S_IFMT) {
-      case S_IFLNK:
-        /* Catch special case of a non dangling symlink */
-        if((fts_options & FTS_LOGICAL) ||
-           ((fts_options & FTS_COMFOLLOW) && curr->fts_level == 0)) {
-          if (copy_file(cp_globals, curr, dne))
-            rval = 1;
-        } else {  
-          if (copy_link(cp_globals, curr, !dne))
-            rval = 1;
-        }
-        break;
-      case S_IFDIR:
-        if (!Rflag && !rflag) {
-          if (curr->fts_info == FTS_D)
-            warnx("%s is a directory (not copied).",
-                  curr->fts_path);
-          (void)fts_set(ftsp, curr, FTS_SKIP);
-          rval = 1;
-          break;
-        }
-
-        /*
-         * Directories get noticed twice:
-         *  In the first pass, create it if needed.
-         *  In the second pass, after the children have been copied,
-         *  set the permissions.
-         */
-        if (curr->fts_info == FTS_D) /* First pass */
-        {
-          /*
-           * If the directory doesn't exist, create the new
-           * one with the from file mode plus owner RWX bits,
-           * modified by the umask.  Trade-off between being
-           * able to write the directory (if from directory is
-           * 555) and not causing a permissions race.  If the
-           * umask blocks owner writes, we fail..
-           */
-          if (dne) {
-            if (mkdir(to.p_path, 
-                      curr->fts_statp->st_mode | S_IRWXU) < 0)
-              err(exit_jump, EXIT_FAILURE, "%s",
-                  to.p_path);
-            /* NOTREACHED */
-          } else if (!S_ISDIR(to_stat.st_mode)) {
-            errno = ENOTDIR;
-            err(exit_jump, EXIT_FAILURE, "%s",
-                to.p_path);
-            /* NOTREACHED */
-          }
-        }
-        else if (curr->fts_info == FTS_DP) /* Second pass */
-        {
-          /*
-           * If not -p and directory didn't exist, set it to be
-           * the same as the from directory, umodified by the 
-           * umask; arguably wrong, but it's been that way 
-           * forever.
-           */
-          if (pflag && setfile(cp_globals, curr->fts_statp, 0))
-            rval = 1;
-          else if (dne)
-            (void)chmod(to.p_path, 
-                        curr->fts_statp->st_mode);
-        }
-        else
-        {
-          warnx("directory %s encountered when not expected.",
-                curr->fts_path);
-          rval = 1;
-          break;
-        }
-
-        break;
-      case S_IFBLK:
-      case S_IFCHR:
-        if (Rflag) {
-          if (copy_special(cp_globals, curr->fts_statp, !dne))
-            rval = 1;
-        } else
-          if (copy_file(cp_globals, curr, dne))
-            rval = 1;
-        break;
-      case S_IFIFO:
-        if (Rflag) {
-          if (copy_fifo(cp_globals, curr->fts_statp, !dne))
-            rval = 1;
-        } else 
-          if (copy_file(cp_globals, curr, dne))
-            rval = 1;
-        break;
-      default:
-        if (copy_file(cp_globals, curr, dne))
-          rval = 1;
-        break;
-    }
-    if (vflag && !rval)
-      (void)printf("%s -> %s\n", curr->fts_path, to.p_path);
-  }
-  if (errno) {
-    err(exit_jump, EXIT_FAILURE, "fts_read");
-    /* NOTREACHED */
-  }
-  return (rval);
+	struct stat to_stat;
+	FTS *ftsp;
+	FTSENT *curr;
+	int base = 0, dne, badcp, rval;
+	size_t nlen;
+	char *p, *target_mid;
+	mode_t mask, mode;
+
+	/*
+	 * Keep an inverted copy of the umask, for use in correcting
+	 * permissions on created directories when not using -p.
+	 */
+	mask = ~umask(0777);
+	umask(~mask);
+
+	if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
+		err(exit_jump, 1, "fts_open");
+	for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) {
+		switch (curr->fts_info) {
+		case FTS_NS:
+		case FTS_DNR:
+		case FTS_ERR:
+			warnx("%s: %s",
+			    curr->fts_path, strerror(curr->fts_errno));
+			badcp = rval = 1;
+			continue;
+		case FTS_DC:			/* Warn, continue. */
+			warnx("%s: directory causes a cycle", curr->fts_path);
+			badcp = rval = 1;
+			continue;
+		default:
+			;
+		}
+
+		/*
+		 * If we are in case (2) or (3) above, we need to append the
+                 * source name to the target name.
+                 */
+		if (type != FILE_TO_FILE) {
+			/*
+			 * Need to remember the roots of traversals to create
+			 * correct pathnames.  If there's a directory being
+			 * copied to a non-existent directory, e.g.
+			 *	cp -R a/dir noexist
+			 * the resulting path name should be noexist/foo, not
+			 * noexist/dir/foo (where foo is a file in dir), which
+			 * is the case where the target exists.
+			 *
+			 * Also, check for "..".  This is for correct path
+			 * concatenation for paths ending in "..", e.g.
+			 *	cp -R .. /tmp
+			 * Paths ending in ".." are changed to ".".  This is
+			 * tricky, but seems the easiest way to fix the problem.
+			 *
+			 * XXX
+			 * Since the first level MUST be FTS_ROOTLEVEL, base
+			 * is always initialized.
+			 */
+			if (curr->fts_level == FTS_ROOTLEVEL) {
+				if (type != DIR_TO_DNE) {
+					p = strrchr(curr->fts_path, '/');
+					base = (p == NULL) ? 0 :
+					    (int)(p - curr->fts_path + 1);
+
+					if (!strcmp(&curr->fts_path[base],
+					    ".."))
+						base += 1;
+				} else
+					base = curr->fts_pathlen;
+			}
+
+			p = &curr->fts_path[base];
+			nlen = curr->fts_pathlen - base;
+			target_mid = to.target_end;
+			if (*p != '/' && target_mid[-1] != '/')
+				*target_mid++ = '/';
+			*target_mid = 0;
+			if (target_mid - to.p_path + nlen >= PATH_MAX) {
+				warnx("%s%s: name too long (not copied)",
+				    to.p_path, p);
+				badcp = rval = 1;
+				continue;
+			}
+			(void)strncat(target_mid, p, nlen);
+			to.p_end = target_mid + nlen;
+			*to.p_end = 0;
+			STRIP_TRAILING_SLASH(to);
+		}
+
+		if (curr->fts_info == FTS_DP) {
+			/*
+			 * We are nearly finished with this directory.  If we
+			 * didn't actually copy it, or otherwise don't need to
+			 * change its attributes, then we are done.
+			 */
+			if (!curr->fts_number)
+				continue;
+			/*
+			 * If -p is in effect, set all the attributes.
+			 * Otherwise, set the correct permissions, limited
+			 * by the umask.  Optimise by avoiding a chmod()
+			 * if possible (which is usually the case if we
+			 * made the directory).  Note that mkdir() does not
+			 * honour setuid, setgid and sticky bits, but we
+			 * normally want to preserve them on directories.
+			 */
+			if (pflag) {
+				if (setfile(cp_globals, curr->fts_statp, -1))
+					rval = 1;
+				if (preserve_dir_acls(curr->fts_statp,
+				    curr->fts_accpath, to.p_path) != 0)
+					rval = 1;
+			} else {
+				mode = curr->fts_statp->st_mode;
+				if ((mode & (S_ISUID | S_ISGID | S_ISTXT)) ||
+				    ((mode | S_IRWXU) & mask) != (mode & mask))
+					if (chmod(to.p_path, mode & mask) != 0){
+						warn("chmod: %s", to.p_path);
+						rval = 1;
+					}
+			}
+			continue;
+		}
+
+		/* Not an error but need to remember it happened */
+		if (stat(to.p_path, &to_stat) == -1)
+			dne = 1;
+		else {
+			if (to_stat.st_dev == curr->fts_statp->st_dev &&
+			    to_stat.st_ino == curr->fts_statp->st_ino) {
+				warnx("%s and %s are identical (not copied).",
+				    to.p_path, curr->fts_path);
+				badcp = rval = 1;
+				if (S_ISDIR(curr->fts_statp->st_mode))
+					(void)fts_set(ftsp, curr, FTS_SKIP);
+				continue;
+			}
+			if (!S_ISDIR(curr->fts_statp->st_mode) &&
+			    S_ISDIR(to_stat.st_mode)) {
+				warnx("cannot overwrite directory %s with "
+				    "non-directory %s",
+				    to.p_path, curr->fts_path);
+				badcp = rval = 1;
+				continue;
+			}
+			dne = 0;
+		}
+
+		switch (curr->fts_statp->st_mode & S_IFMT) {
+		case S_IFLNK:
+			/* Catch special case of a non-dangling symlink */
+			if ((fts_options & FTS_LOGICAL) ||
+			    ((fts_options & FTS_COMFOLLOW) &&
+			    curr->fts_level == 0)) {
+				if (copy_file(cp_globals, curr, dne))
+					badcp = rval = 1;
+			} else {	
+				if (copy_link(cp_globals, curr, !dne))
+					badcp = rval = 1;
+			}
+			break;
+		case S_IFDIR:
+			if (!Rflag) {
+				warnx("%s is a directory (not copied).",
+				    curr->fts_path);
+				(void)fts_set(ftsp, curr, FTS_SKIP);
+				badcp = rval = 1;
+				break;
+			}
+			/*
+			 * If the directory doesn't exist, create the new
+			 * one with the from file mode plus owner RWX bits,
+			 * modified by the umask.  Trade-off between being
+			 * able to write the directory (if from directory is
+			 * 555) and not causing a permissions race.  If the
+			 * umask blocks owner writes, we fail..
+			 */
+			if (dne) {
+				if (mkdir(to.p_path,
+				    curr->fts_statp->st_mode | S_IRWXU) < 0)
+					err(exit_jump, 1, "%s", to.p_path);
+			} else if (!S_ISDIR(to_stat.st_mode)) {
+				errno = ENOTDIR;
+				err(exit_jump, 1, "%s", to.p_path);
+			}
+			/*
+			 * Arrange to correct directory attributes later
+			 * (in the post-order phase) if this is a new
+			 * directory, or if the -p flag is in effect.
+			 */
+			curr->fts_number = pflag || dne;
+			break;
+		case S_IFBLK:
+		case S_IFCHR:
+			if (Rflag) {
+				if (copy_special(cp_globals, curr->fts_statp, !dne))
+					badcp = rval = 1;
+			} else {
+				if (copy_file(cp_globals, curr, dne))
+					badcp = rval = 1;
+			}
+			break;
+		case S_IFSOCK:
+			warnx("%s is a socket (not copied).",
+				    curr->fts_path);
+		case S_IFIFO:
+			if (Rflag) {
+				if (copy_fifo(cp_globals, curr->fts_statp, !dne))
+					badcp = rval = 1;
+			} else {
+				if (copy_file(cp_globals, curr, dne))
+					badcp = rval = 1;
+			}
+			break;
+		default:
+			if (copy_file(cp_globals, curr, dne))
+				badcp = rval = 1;
+			break;
+		}
+		if (vflag && !badcp)
+			(void)printf("%s -> %s\n", curr->fts_path, to.p_path);
+	}
+	if (errno)
+		err(exit_jump, 1, "fts_read");
+	fts_close(ftsp);
+	return (rval);
 }
 
 /*
  * mastercmp --
- *  The comparison function for the copy order.  The order is to copy
- *  non-directory files before directory files.  The reason for this
- *  is because files tend to be in the same cylinder group as their
- *  parent directory, whereas directories tend not to be.  Copying the
- *  files first reduces seeking.
+ *	The comparison function for the copy order.  The order is to copy
+ *	non-directory files before directory files.  The reason for this
+ *	is because files tend to be in the same cylinder group as their
+ *	parent directory, whereas directories tend not to be.  Copying the
+ *	files first reduces seeking.
  */
 int
 mastercmp(const FTSENT **a, const FTSENT **b)
 {
-  int a_info, b_info;
-
-  a_info = (*a)->fts_info;
-  if (a_info == FTS_ERR || a_info == FTS_NS || a_info == FTS_DNR)
-    return (0);
-  b_info = (*b)->fts_info;
-  if (b_info == FTS_ERR || b_info == FTS_NS || b_info == FTS_DNR)
-    return (0);
-  if (a_info == FTS_D)
-    return (-1);
-  if (b_info == FTS_D)
-    return (1);
-  return (0);
+	int a_info, b_info;
+
+	a_info = (*a)->fts_info;
+	if (a_info == FTS_ERR || a_info == FTS_NS || a_info == FTS_DNR)
+		return (0);
+	b_info = (*b)->fts_info;
+	if (b_info == FTS_ERR || b_info == FTS_NS || b_info == FTS_DNR)
+		return (0);
+	if (a_info == FTS_D)
+		return (-1);
+	if (b_info == FTS_D)
+		return (1);
+	return (0);
 }
 
 rtems_shell_cmd_t rtems_shell_CP_Command = {
@@ -533,3 +547,4 @@ rtems_shell_cmd_t rtems_shell_CP_Command = {
   NULL,                                                /* alias */
   NULL                                                 /* next */
 };
+