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.

9 files changed, 755 insertions, 538 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index e5e8e0502b..4415999fae 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
 2008-04-09	Madhusudan.C.S <madhusudancs@gmail.com>
 
 	* score/include/rtems/score/tod.h: Fix typo.
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index f62c9f96ac..dae118e2cf 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -58,8 +58,8 @@ TERMIOS_C_FILES = src/cfgetispeed.c src/cfgetospeed.c src/cfsetispeed.c \
 SYSTEM_CALL_C_FILES = src/open.c src/close.c src/read.c src/write.c \
     src/write_r.c \
     src/lseek.c src/ioctl.c src/mkdir.c src/mknod.c src/mkfifo.c src/rmdir.c \
-    src/chdir.c src/chmod.c src/fchdir.c src/fchmod.c src/chown.c src/link.c \
-    src/unlink.c src/umask.c src/ftruncate.c src/utime.c src/fstat.c \
+    src/chdir.c src/chmod.c src/fchdir.c src/fchmod.c src/fchown.c src/chown.c \
+    src/link.c src/unlink.c src/umask.c src/ftruncate.c src/utime.c src/fstat.c \
     src/fcntl.c src/fpathconf.c src/getdents.c src/fsync.c src/fdatasync.c \
     src/pipe.c src/dup.c src/dup2.c src/symlink.c src/readlink.c src/creat.c \
     src/chroot.c src/sync.c src/_rename_r.c
diff --git a/cpukit/libcsupport/src/fchown.c b/cpukit/libcsupport/src/fchown.c
new file mode 100644
index 0000000000..b066037717
--- /dev/null
+++ b/cpukit/libcsupport/src/fchown.c
@@ -0,0 +1,45 @@
+/*
+ *  fchown() - POSIX 1003.1b 5.6.5 - Change Owner and Group of a File
+ *
+ *  COPYRIGHT (c) 1989-1999.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/stat.h>
+#include <errno.h>
+
+#include <rtems.h>
+#include <rtems/libio.h>
+
+#include <rtems/libio_.h>
+#include <rtems/seterr.h>
+
+int fchown(
+  int   fd,
+  uid_t owner,
+  gid_t group
+)
+{
+  rtems_libio_t *iop;
+
+  rtems_libio_check_fd( fd );
+  iop = rtems_libio_iop( fd );
+  rtems_libio_check_is_open(iop);
+
+  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
+
+  if ( !iop->pathinfo.ops->chown_h )
+    rtems_set_errno_and_return_minus_one( ENOTSUP );
+
+  return (*iop->pathinfo.ops->chown_h)( &iop->pathinfo, owner, group );
+}
diff --git a/cpukit/libmisc/shell/extern-cp.h b/cpukit/libmisc/shell/extern-cp.h
index 614142aa9a..ba6ff9c4de 100644
--- a/cpukit/libmisc/shell/extern-cp.h
+++ b/cpukit/libmisc/shell/extern-cp.h
@@ -46,21 +46,22 @@ typedef struct {
 
 typedef struct {
   PATH_T to;
+  int info;
   uid_t myuid;
-  int Rflag, fflag, iflag, pflag, rflag, vflag, Nflag;
+  int fflag, iflag, lflag, nflag, pflag, vflag;
   mode_t myumask;
   jmp_buf exit_jmp;
 } rtems_shell_cp_globals;
 
 #define to           cp_globals->to
+#define info         cp_globals->info
 #define myuid        cp_globals->myuid
-#define Rflag        cp_globals->Rflag
 #define fflag        cp_globals->fflag
 #define iflag        cp_globals->iflag
+#define lflag        cp_globals->lflag
+#define nflag        cp_globals->nflag
 #define pflag        cp_globals->pflag
-#define rflag        cp_globals->rflag
 #define vflag        cp_globals->vflag
-#define Nflag        cp_globals->Nflag
 #define myumask      cp_globals->myumask
 #define exit_jump    &(cp_globals->exit_jmp)
 
@@ -81,7 +82,10 @@ int	copy_link(rtems_shell_cp_globals* cp_globals, FTSENT *, int);
 int	copy_special(rtems_shell_cp_globals* cp_globals, struct stat *, int);
 int	set_utimes(const char *, struct stat *);
 int	setfile(rtems_shell_cp_globals* cp_globals, struct stat *, int);
+int	preserve_dir_acls(struct stat *, char *, char *);
+int	preserve_fd_acls(int, int);
 void	usage();
+
 __END_DECLS
 
 #endif /* !_EXTERN_H_ */
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 */
 };
+ 
diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c
index 76ca6c0d7b..a857e7bfa3 100644
--- a/cpukit/libmisc/shell/shell.c
+++ b/cpukit/libmisc/shell/shell.c
@@ -806,8 +806,12 @@ rtems_boolean rtems_shell_main_loop(
                   __DATE__". 'help' to list commands.\n",
                   shell_env->devname);
         }
+
+        if (input_file)
+          chdir(shell_env->cwd);
+        else
+          chdir("/"); /* XXX: chdir to getpwent homedir */
         
-        chdir("/"); /* XXX: chdir to getpwent homedir */
         shell_env->exit_shell = FALSE;
 
         for (;;) {
@@ -832,6 +836,9 @@ rtems_boolean rtems_shell_main_loop(
 
           line++;
 
+          if (shell_env->echo)
+            fprintf(stdout, "%d: %s\n", line, cmds[cmd]);
+          
           /* evaluate cmd section */
           c = cmds[cmd];
           while (*c) {
@@ -911,7 +918,8 @@ static rtems_status_code   rtems_shell_run (
   const char*          input,
   const char*          output,
   int                  output_append,
-  rtems_id             wake_on_end
+  rtems_id             wake_on_end,
+  int                  echo
 )
 {
   rtems_id           task_id;
@@ -949,11 +957,14 @@ static rtems_status_code   rtems_shell_run (
   shell_env->tcflag        = tcflag;
   shell_env->exit_shell    = FALSE;
   shell_env->forever       = forever;
+  shell_env->echo          = echo;
   shell_env->input         = strdup (input);
   shell_env->output        = strdup (output);
   shell_env->output_append = output_append;
   shell_env->wake_on_end   = wake_on_end;
 
+  getcwd(shell_env->cwd, sizeof(shell_env->cwd));
+
   return rtems_task_start(task_id, rtems_shell_task,
                           (rtems_task_argument) shell_env);
 }
@@ -969,7 +980,7 @@ rtems_status_code   rtems_shell_init (
 {
   return rtems_shell_run (task_name, task_stacksize, task_priority,
                           devname, tcflag, forever,
-                          "stdin", "stdout", 0, RTEMS_INVALID_ID);
+                          "stdin", "stdout", 0, RTEMS_INVALID_ID, 0);
 }
 
 rtems_status_code   rtems_shell_script (
@@ -979,7 +990,8 @@ rtems_status_code   rtems_shell_script (
   const char*          input,
   const char*          output,
   int                  output_append,
-  int                  wait
+  int                  wait,
+  int                  echo
 )
 {
   rtems_id          current_task = RTEMS_INVALID_ID;
@@ -993,7 +1005,7 @@ rtems_status_code   rtems_shell_script (
   
   sc = rtems_shell_run (task_name, task_stacksize, task_priority,
                         NULL, 0, 0, input, output, output_append,
-                        current_task);
+                        current_task, echo);
   if (sc != RTEMS_SUCCESSFUL)
     return sc;
 
diff --git a/cpukit/libmisc/shell/shell.h b/cpukit/libmisc/shell/shell.h
index 10b10bd6ff..89b041a70f 100644
--- a/cpukit/libmisc/shell/shell.h
+++ b/cpukit/libmisc/shell/shell.h
@@ -170,7 +170,8 @@ rtems_status_code rtems_shell_script(
   const char          *input,
   const char          *output,
   int                  output_append,
-  int                  wait
+  int                  wait,
+  int                  echo
 );
 
 /*
@@ -188,6 +189,8 @@ typedef struct  {
   int         exit_shell; /* logout */
   int         forever   ; /* repeat login */
   int         errorlevel;
+  int         echo;
+  char        cwd[256];
   const char* input;
   const char* output;
   int         output_append;
diff --git a/cpukit/libmisc/shell/shell_script.c b/cpukit/libmisc/shell/shell_script.c
index 435338951b..142d7d3189 100644
--- a/cpukit/libmisc/shell/shell_script.c
+++ b/cpukit/libmisc/shell/shell_script.c
@@ -189,7 +189,8 @@ int rtems_shell_main_joel(
     scriptFile,      /* the script file */
     outputFile,      /* where to redirect the script */
     0,               /* run once and exit */
-    1                /* we will wait */
+    1,               /* we will wait */
+    verbose          /* do we echo */
   );
   if (result)
     return -1;
diff --git a/cpukit/libmisc/shell/utils-cp.c b/cpukit/libmisc/shell/utils-cp.c
index 52cbc63470..defd5dd021 100644
--- a/cpukit/libmisc/shell/utils-cp.c
+++ b/cpukit/libmisc/shell/utils-cp.c
@@ -52,6 +52,7 @@ __RCSID("$NetBSD: utils.c,v 1.29 2005/10/15 18:22:18 christos Exp $");
 #include <errno.h>
 #include <fcntl.h>
 #include <fts.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -62,6 +63,8 @@ __RCSID("$NetBSD: utils.c,v 1.29 2005/10/15 18:22:18 christos Exp $");
 #define lchmod  chmod
 #define lchown  chown
 
+#define cp_pct(x, y)    ((y == 0) ? 0 : (int)(100.0 * (x) / (y)))
+
 int
 set_utimes(const char *file, struct stat *fs)
 {
@@ -81,9 +84,16 @@ int
 copy_file(rtems_shell_cp_globals* cp_globals, FTSENT *entp, int dne)
 {
 	static char buf[MAXBSIZE];
-	struct stat to_stat, *fs;
-	int ch, checkch, from_fd, rcount, rval, to_fd, wcount;
-	
+	struct stat *fs;
+	ssize_t wcount;
+	size_t wresid;
+	off_t wtotal;
+	int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0;
+	char *bufp;
+#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
+	char *p;
+#endif
+
 	if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) {
 		warn("%s", entp->fts_path);
 		return (1);
@@ -100,30 +110,41 @@ copy_file(rtems_shell_cp_globals* cp_globals, FTSENT *entp, int dne)
 	 * modified by the umask.)
 	 */
 	if (!dne) {
-		if (iflag) {
-			(void)fprintf(stderr, "overwrite %s? ", to.p_path);
+#define YESNO "(y/n [n]) "
+		if (nflag) {
+			if (vflag)
+				printf("%s not overwritten\n", to.p_path);
+			(void)close(from_fd);
+			return (0);
+		} else if (iflag) {
+			(void)fprintf(stderr, "overwrite %s? %s", 
+					to.p_path, YESNO);
 			checkch = ch = getchar();
 			while (ch != '\n' && ch != EOF)
 				ch = getchar();
 			if (checkch != 'y' && checkch != 'Y') {
 				(void)close(from_fd);
-				return (0);
+				(void)fprintf(stderr, "not overwritten\n");
+				return (1);
 			}
 		}
-		/* overwrite existing destination file name */
-		to_fd = open(to.p_path, O_WRONLY | O_TRUNC, 0);
-	} else
-		to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
-		    fs->st_mode & ~(S_ISUID | S_ISGID));
-
-	if (to_fd == -1 && fflag) {
-		/*
-		 * attempt to remove existing destination file name and
-		 * create a new file
-		 */
-		(void)unlink(to.p_path);
-		to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
-			     fs->st_mode & ~(S_ISUID | S_ISGID));
+		
+		if (fflag) {
+		    /* remove existing destination file name, 
+		     * create a new file  */
+		    (void)unlink(to.p_path);
+				if (!lflag)
+		    	to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
+				  fs->st_mode & ~(S_ISUID | S_ISGID));
+		} else {
+				if (!lflag)
+		    	/* overwrite existing destination file name */
+		    	to_fd = open(to.p_path, O_WRONLY | O_TRUNC, 0);
+		}
+	} else {
+		if (!lflag)
+			to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
+		  fs->st_mode & ~(S_ISUID | S_ISGID));
 	}
 
 	if (to_fd == -1) {
@@ -134,45 +155,69 @@ copy_file(rtems_shell_cp_globals* cp_globals, FTSENT *entp, int dne)
 
 	rval = 0;
 
-	/*
-	 * There's no reason to do anything other than close the file
-	 * now if it's empty, so let's not bother.
-	 */
-
-	if (fs->st_size) {
-
+	if (!lflag) {
 		/*
-		 * Mmap and write if less than 8M (the limit is so
-		 * we don't totally trash memory on big files).
-		 * This is really a minor hack, but it wins some CPU back.
+		 * Mmap and write if less than 8M (the limit is so we don't totally
+		 * trash memory on big files.  This is really a minor hack, but it
+		 * wins some CPU back.
 		 */
-#if 0
-		if (fs->st_size <= 8 * 1048576) {
-			size_t fsize = (size_t)fs->st_size;
-			p = mmap(NULL, fsize, PROT_READ, MAP_FILE|MAP_SHARED,
-			    from_fd, (off_t)0);
-			if (p == MAP_FAILED) {
-				goto mmap_failed;
+#ifdef CCJ_REMOVED_VM_AND_BUFFER_CACHE_SYNCHRONIZED
+		if (S_ISREG(fs->st_mode) && fs->st_size > 0 &&
+	    	fs->st_size <= 8 * 1048576) {
+			if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
+		    	MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
+				warn("%s", entp->fts_path);
+				rval = 1;
 			} else {
-				(void) madvise(p, (size_t)fs->st_size,
-				     MADV_SEQUENTIAL);
-				if (write(to_fd, p, fsize) !=
-				    fs->st_size) {
+				wtotal = 0;
+				for (bufp = p, wresid = fs->st_size; ;
+			    	bufp += wcount, wresid -= (size_t)wcount) {
+					wcount = write(to_fd, bufp, wresid);
+					if (wcount <= 0)
+						break;
+					wtotal += wcount;
+					if (info) {
+						info = 0;
+						(void)fprintf(stderr,
+						    "%s -> %s %3d%%\n",
+						    entp->fts_path, to.p_path,
+						    cp_pct(wtotal, fs->st_size));
+					}
+					if (wcount >= (ssize_t)wresid)
+						break;
+				}
+				if (wcount != (ssize_t)wresid) {
 					warn("%s", to.p_path);
 					rval = 1;
 				}
-				if (munmap(p, fsize) < 0) {
+				/* Some systems don't unmap on close(2). */
+				if (munmap(p, fs->st_size) < 0) {
 					warn("%s", entp->fts_path);
 					rval = 1;
 				}
 			}
-		} else {
-mmap_failed:
+		} else
 #endif
 		{
+			wtotal = 0;
 			while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) {
-				wcount = write(to_fd, buf, (size_t)rcount);
-				if (rcount != wcount || wcount == -1) {
+				for (bufp = buf, wresid = rcount; ;
+			    	bufp += wcount, wresid -= wcount) {
+					wcount = write(to_fd, bufp, wresid);
+					if (wcount <= 0)
+						break;
+					wtotal += wcount;
+					if (info) {
+						info = 0;
+						(void)fprintf(stderr,
+						    "%s -> %s %3d%%\n",
+						    entp->fts_path, to.p_path,
+						    cp_pct(wtotal, fs->st_size));
+					}
+					if (wcount >= (ssize_t)wresid)
+						break;
+				}
+				if (wcount != (ssize_t)wresid) {
 					warn("%s", to.p_path);
 					rval = 1;
 					break;
@@ -183,41 +228,32 @@ mmap_failed:
 				rval = 1;
 			}
 		}
+	} else {
+		if (link(entp->fts_path, to.p_path)) {
+			warn("%s", to.p_path);
+			rval = 1;
+		}
 	}
-
-	if (rval == 1) {
-		(void)close(from_fd);
-		(void)close(to_fd);
-		return (1);
-	}
-
-	if (pflag && setfile(cp_globals, fs, to_fd))
-		rval = 1;
+	(void)close(from_fd);
+	
 	/*
-	 * If the source was setuid or setgid, lose the bits unless the
-	 * copy is owned by the same user and group.
+	 * Don't remove the target even after an error.  The target might
+	 * not be a regular file, or its attributes might be important,
+	 * or its contents might be irreplaceable.  It would only be safe
+	 * to remove it if we created it and its length is 0.
 	 */
-#define	RETAINBITS \
-	(S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
-	else if (fs->st_mode & (S_ISUID | S_ISGID) && fs->st_uid == myuid) {
-		if (fstat(to_fd, &to_stat)) {
-			warn("%s", to.p_path);
+
+	if (!lflag) {
+		if (pflag && setfile(cp_globals, fs, to_fd))
 			rval = 1;
-		} else if (fs->st_gid == to_stat.st_gid &&
-		    fchmod(to_fd, fs->st_mode & RETAINBITS & ~myumask)) {
+		if (pflag && preserve_fd_acls(from_fd, to_fd) != 0)
+			rval = 1;
+		(void)close(from_fd);
+		if (close(to_fd)) {
 			warn("%s", to.p_path);
 			rval = 1;
 		}
 	}
-	(void)close(from_fd);
-	if (close(to_fd)) {
-		warn("%s", to.p_path);
-		rval = 1;
-	}
-	/* set the mod/access times now after close of the fd */
-	if (pflag && set_utimes(to.p_path, fs)) { 
-	    rval = 1;
-	}
 	return (rval);
 }
 
@@ -225,22 +261,22 @@ int
 copy_link(rtems_shell_cp_globals* cp_globals, FTSENT *p, int exists)
 {
 	int len;
-	char target[MAXPATHLEN];
+	char llink[PATH_MAX];
 
-	if ((len = readlink(p->fts_path, target, sizeof(target)-1)) == -1) {
+	if ((len = readlink(p->fts_path, llink, sizeof(llink) - 1)) == -1) {
 		warn("readlink: %s", p->fts_path);
 		return (1);
 	}
-	target[len] = '\0';
+	llink[len] = '\0';
 	if (exists && unlink(to.p_path)) {
 		warn("unlink: %s", to.p_path);
 		return (1);
 	}
-	if (symlink(target, to.p_path)) {
-		warn("symlink: %s", target);
+	if (symlink(llink, to.p_path)) {
+		warn("symlink: %s", llink);
 		return (1);
 	}
-	return (pflag ? setfile(cp_globals, p->fts_statp, 0) : 0);
+	return (pflag ? setfile(cp_globals, p->fts_statp, -1) : 0);
 }
 
 int
@@ -254,7 +290,7 @@ copy_fifo(rtems_shell_cp_globals* cp_globals, struct stat *from_stat, int exists
 		warn("mkfifo: %s", to.p_path);
 		return (1);
 	}
-	return (pflag ? setfile(cp_globals, from_stat, 0) : 0);
+	return (pflag ? setfile(cp_globals, from_stat, -1) : 0);
 }
 
 int
@@ -268,83 +304,172 @@ copy_special(rtems_shell_cp_globals* cp_globals, struct stat *from_stat, int exi
 		warn("mknod: %s", to.p_path);
 		return (1);
 	}
-	return (pflag ? setfile(cp_globals, from_stat, 0) : 0);
+	return (pflag ? setfile(cp_globals, from_stat, -1) : 0);
 }
 
+#define TIMESPEC_TO_TIMEVAL(tv, ts) {                                   \
+        (tv)->tv_sec = *(ts);                                           \
+        (tv)->tv_usec = 0;                                              \
+}
 
-/*
- * Function: setfile
- *
- * Purpose:
- *   Set the owner/group/permissions for the "to" file to the information
- *   in the stat structure.  If fd is zero, also call set_utimes() to set
- *   the mod/access times.  If fd is non-zero, the caller must do a utimes
- *   itself after close(fd).
- */
-#define st_flags st_mode
+#define st_atimespec st_atime
+#define st_mtimespec st_mtime
+#define lutimes utimes
 
 int
 setfile(rtems_shell_cp_globals* cp_globals, struct stat *fs, int fd)
 {
-	int rval, islink;
+	static struct timeval tv[2];
+	struct stat ts;
+	int rval, gotstat, islink, fdval;
 
 	rval = 0;
-	islink = S_ISLNK(fs->st_mode);
-	fs->st_mode &= S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
+	fdval = fd != -1;
+	islink = !fdval && S_ISLNK(fs->st_mode);
+	fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
+		       S_IRWXU | S_IRWXG | S_IRWXO;
 
+	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
+	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
+#if 0
+	if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
+		warn("%sutimes: %s", islink ? "l" : "", to.p_path);
+		rval = 1;
+	}
+#endif
+	if (fdval ? fstat(fd, &ts) :
+	    (islink ? lstat(to.p_path, &ts) : stat(to.p_path, &ts)))
+		gotstat = 0;
+	else {
+		gotstat = 1;
+		ts.st_mode &= S_ISUID | S_ISGID | S_ISVTX |
+			      S_IRWXU | S_IRWXG | S_IRWXO;
+	}
 	/*
 	 * Changing the ownership probably won't succeed, unless we're root
 	 * or POSIX_CHOWN_RESTRICTED is not set.  Set uid/gid before setting
 	 * the mode; current BSD behavior is to remove all setuid bits on
 	 * chown.  If chown fails, lose setuid/setgid bits.
 	 */
+	if (!gotstat || fs->st_uid != ts.st_uid || fs->st_gid != ts.st_gid)
+		if (fdval ? fchown(fd, fs->st_uid, fs->st_gid) :
+		    (islink ? lchown(to.p_path, fs->st_uid, fs->st_gid) :
+		    chown(to.p_path, fs->st_uid, fs->st_gid))) {
+			if (errno != EPERM) {
+				warn("chown: %s", to.p_path);
+				rval = 1;
+			}
+			fs->st_mode &= ~(S_ISUID | S_ISGID);
+		}
+
+	if (!gotstat || fs->st_mode != ts.st_mode)
+		if (fdval ? fchmod(fd, fs->st_mode) :
+		    (islink ? lchmod(to.p_path, fs->st_mode) :
+		    chmod(to.p_path, fs->st_mode))) {
+			warn("chmod: %s", to.p_path);
+			rval = 1;
+		}
+
 #if 0
-	if (fd ? fchown(fd, fs->st_uid, fs->st_gid) :
-	    lchown(to.p_path, fs->st_uid, fs->st_gid)) {
-#endif
-	if (lchown(to.p_path, fs->st_uid, fs->st_gid)) {
-		if (errno != EPERM) {
-			warn("chown: %s", to.p_path);
+	if (!gotstat || fs->st_flags != ts.st_flags)
+		if (fdval ?
+		    fchflags(fd, fs->st_flags) :
+		    (islink ? (errno = ENOSYS) :
+		    chflags(to.p_path, fs->st_flags))) {
+			warn("chflags: %s", to.p_path);
 			rval = 1;
 		}
-		fs->st_mode &= ~(S_ISUID | S_ISGID);
+#endif
+  
+	return (rval);
+}
+
+int
+preserve_fd_acls(int source_fd, int dest_fd)
+{
+#if 0
+	struct acl *aclp;
+	acl_t acl;
+
+	if (fpathconf(source_fd, _PC_ACL_EXTENDED) != 1 ||
+	    fpathconf(dest_fd, _PC_ACL_EXTENDED) != 1)
+		return (0);
+	acl = acl_get_fd(source_fd);
+	if (acl == NULL) {
+		warn("failed to get acl entries while setting %s", to.p_path);
+		return (1);
 	}
-	if (fd ? fchmod(fd, fs->st_mode) : lchmod(to.p_path, fs->st_mode)) {
-		warn("chmod: %s", to.p_path);
-		rval = 1;
+	aclp = &acl->ats_acl;
+	if (aclp->acl_cnt == 3)
+		return (0);
+	if (acl_set_fd(dest_fd, acl) < 0) {
+		warn("failed to set acl entries for %s", to.p_path);
+		return (1);
 	}
+#endif
+	return (0);
+}
 
+int
+preserve_dir_acls(struct stat *fs, char *source_dir, char *dest_dir)
+{
 #if 0
-	if (!islink && !Nflag) {
-		unsigned long fflags = fs->st_flags;
-		/*
-		 * XXX
-		 * NFS doesn't support chflags; ignore errors unless
-		 * there's reason to believe we're losing bits.
-		 * (Note, this still won't be right if the server
-		 * supports flags and we were trying to *remove* flags
-		 * on a file that we copied, i.e., that we didn't create.)
-		 */
-		errno = 0;
-		if ((fd ? fchflags(fd, fflags) :
-		    chflags(to.p_path, fflags)) == -1)
-			if (errno != EOPNOTSUPP || fs->st_flags != 0) {
-				warn("chflags: %s", to.p_path);
-				rval = 1;
-			}
+	acl_t (*aclgetf)(const char *, acl_type_t);
+	int (*aclsetf)(const char *, acl_type_t, acl_t);
+	struct acl *aclp;
+	acl_t acl;
+
+	if (pathconf(source_dir, _PC_ACL_EXTENDED) != 1 ||
+	    pathconf(dest_dir, _PC_ACL_EXTENDED) != 1)
+		return (0);
+	/*
+	 * If the file is a link we will not follow it
+	 */
+	if (S_ISLNK(fs->st_mode)) {
+		aclgetf = acl_get_link_np;
+		aclsetf = acl_set_link_np;
+	} else {
+		aclgetf = acl_get_file;
+		aclsetf = acl_set_file;
+	}
+	/*
+	 * Even if there is no ACL_TYPE_DEFAULT entry here, a zero
+	 * size ACL will be returned. So it is not safe to simply
+	 * check the pointer to see if the default ACL is present.
+	 */
+	acl = aclgetf(source_dir, ACL_TYPE_DEFAULT);
+	if (acl == NULL) {
+		warn("failed to get default acl entries on %s",
+		    source_dir);
+		return (1);
+	}
+	aclp = &acl->ats_acl;
+	if (aclp->acl_cnt != 0 && aclsetf(dest_dir,
+	    ACL_TYPE_DEFAULT, acl) < 0) {
+		warn("failed to set default acl entries on %s",
+		    dest_dir);
+		return (1);
+	}
+	acl = aclgetf(source_dir, ACL_TYPE_ACCESS);
+	if (acl == NULL) {
+		warn("failed to get acl entries on %s", source_dir);
+		return (1);
+	}
+	aclp = &acl->ats_acl;
+	if (aclsetf(dest_dir, ACL_TYPE_ACCESS, acl) < 0) {
+		warn("failed to set acl entries on %s", dest_dir);
+		return (1);
 	}
 #endif
-	/* if fd is non-zero, caller must call set_utimes() after close() */
-	if (fd == 0 && set_utimes(to.p_path, fs))
-	    rval = 1;
-	return (rval);
+	return (0);
 }
 
 void
 usage(void)
 {
-	(void)fprintf(stderr,
-	    "usage: %s [-R [-H | -L | -P]] [-f | -i] [-pv] src target\n"
-	    "       %s [-R [-H | -L | -P]] [-f | -i] [-pv] src1 ... srcN directory\n",
-	    "cp", "cp");
+
+	(void)fprintf(stderr, "%s\n%s\n",
+"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file",
+"       cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... "
+"target_directory");
 }