diff options
author | Chris Johns <chrisj@rtems.org> | 2008-08-07 02:23:11 +0000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2008-08-07 02:23:11 +0000 |
commit | 8192e4ff6139a599d38e7df8a4d27f12144cfad8 (patch) | |
tree | cf02a8c71d66583a746bffb40af086108dcde879 | |
parent | 2008-08-06 Chris Johns <chrisj@rtems.org> (diff) | |
download | rtems-8192e4ff6139a599d38e7df8a4d27f12144cfad8.tar.bz2 |
2008-08-07 Chris Johns <chrisj@rtems.org>
* libcsupport/src/_rename_r.c: Fixed return code bug. Add a check
to see if the 'to' path was a directory and removed the directory.
* libmisc/Makefile.am, libmisc/shell/shellconfig.h: Added the mv command.
* libmisc/shell/main_mv.c, libmisc/shell/pathnames-mv.h: New.
-rw-r--r-- | cpukit/ChangeLog | 9 | ||||
-rw-r--r-- | cpukit/libcsupport/src/_rename_r.c | 10 | ||||
-rw-r--r-- | cpukit/libmisc/Makefile.am | 2 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_mv.c | 486 | ||||
-rw-r--r-- | cpukit/libmisc/shell/pathnames-mv.h | 40 | ||||
-rw-r--r-- | cpukit/libmisc/shell/shellconfig.h | 6 |
6 files changed, 550 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index ea11c91d4b..03867742fb 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,12 @@ +2008-08-07 Chris Johns <chrisj@rtems.org> + + * libcsupport/src/_rename_r.c: Fixed return code bug. Add a check + to see if the 'to' path was a directory and removed the directory. + + * libmisc/Makefile.am, libmisc/shell/shellconfig.h: Added the mv command. + + * libmisc/shell/main_mv.c, libmisc/shell/pathnames-mv.h: New. + 2008-08-06 Chris Johns <chrisj@rtems.org> * libblock/src/bdbuf.c: PR1272. Fixed similar possible issues in diff --git a/cpukit/libcsupport/src/_rename_r.c b/cpukit/libcsupport/src/_rename_r.c index b0a636f468..1395099b5e 100644 --- a/cpukit/libcsupport/src/_rename_r.c +++ b/cpukit/libcsupport/src/_rename_r.c @@ -25,16 +25,22 @@ #include <rtems/libio_.h> #include <rtems/seterr.h> +#include <sys/stat.h> + int _rename_r( struct _reent *ptr, const char *old, const char *new ) { + struct stat sb; int s; + s = stat( old, &sb); + if ( s < 0 ) + return s; s = link( old, new ); - if ( !s ) + if ( s < 0 ) return s; - return unlink( old ); + return S_ISDIR(sb.st_mode) ? rmdir( old ) : unlink( old ); } diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index e262348016..2dfa8d8628 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -73,7 +73,7 @@ libshell_a_SOURCES = shell/cat_file.c shell/cmds.c shell/internal.h \ shell/main_mdump.c shell/main_medit.c shell/main_mfill.c \ shell/main_mkdir.c shell/main_mount.c \ shell/main_mount_msdos.c shell/main_mmove.c shell/main_msdosfmt.c \ - shell/main_mwdump.c shell/main_perioduse.c shell/main_pwd.c \ + shell/main_mv.c shell/main_mwdump.c shell/main_perioduse.c shell/main_pwd.c \ shell/main_rm.c shell/main_rmdir.c shell/main_sleep.c \ shell/main_stackuse.c shell/main_tty.c shell/main_umask.c \ shell/main_unmount.c shell/main_blksync.c shell/main_whoami.c \ diff --git a/cpukit/libmisc/shell/main_mv.c b/cpukit/libmisc/shell/main_mv.c new file mode 100644 index 0000000000..62f3c15a5e --- /dev/null +++ b/cpukit/libmisc/shell/main_mv.c @@ -0,0 +1,486 @@ +/* $NetBSD: mv.c,v 1.41 2008/07/20 00:52:40 lukem Exp $ */ + +/* + * Copyright (c) 1989, 1993, 1994 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Ken Smith of The State University of New York at Buffalo. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if 0 +#include <sys/cdefs.h> +#ifndef lint +__COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\ + The Regents of the University of California. All rights reserved."); +#endif /* not lint */ + +#ifndef lint +#if 0 +static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94"; +#else +__RCSID("$NetBSD: mv.c,v 1.41 2008/07/20 00:52:40 lukem Exp $"); +#endif +#endif /* not lint */ +#endif + +#include <rtems.h> +#include <rtems/shell.h> +#include <rtems/shellconfig.h> +#include <getopt.h> + +#include <sys/param.h> +#include <sys/time.h> +#include <sys/wait.h> +#include <sys/stat.h> + +#include <err.h> +#include <errno.h> +#include <fcntl.h> +#include <grp.h> +#include <locale.h> +#include <pwd.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include "pathnames-mv.h" + +/* RTEMS specific changes */ +typedef struct { + int fflg, iflg, vflg; + int stdin_ok; + int exit_code; + jmp_buf exit_jmp; +} rtems_shell_mv_globals; + +int copy(char *, char *); +int do_move(char *, char *); +int fastcopy(char *, char *, struct stat *); +void usage(void); +int main(int, char *[]); + +#define fflg globals->fflg +#define iflg globals->iflg +#define vflg globals->vflg +#define stdin_ok globals->stdin_ok +#define exit_jump &(globals->exit_jmp) + +#include <setjmp.h> + +#define exit(ec) rtems_shell_mv_exit(globals, ec) + +void +rtems_shell_mv_exit (rtems_shell_mv_globals* globals, int code) +{ + globals->exit_code = code; + longjmp (globals->exit_jmp, 1); +} + +void strmode(mode_t mode, char *p); +const char *user_from_uid(uid_t uid, int nouser); +char *group_from_gid(gid_t gid, int nogroup); + +static int main_mv(rtems_shell_mv_globals* globals, int argc, char *argv[]); + +int rtems_shell_main_cp(int argc, char *argv[]); +int rtems_shell_main_rm(int argc, char *argv[]); + +int +rtems_shell_main_mv(int argc, char *argv[]) +{ + rtems_shell_mv_globals mv_globals; + memset (&mv_globals, 0, sizeof (mv_globals)); + mv_globals.exit_code = 1; + if (setjmp (mv_globals.exit_jmp) == 0) + return main_mv (&mv_globals, argc, argv); + return mv_globals.exit_code; +} + +#define do_move(a1, a2) do_move_mv(globals, a1, a2) +#define fastcopy(a1, a2, a3) fastcopy_mv(globals, a1, a2, a3) +#define copy(a1, a2) copy_mv(globals, a1, a2) +#define usage() usage_mv(globals) + +static int do_move_mv(rtems_shell_mv_globals* globals, char *from, char *to); +static int fastcopy_mv(rtems_shell_mv_globals* globals, + char *from, char *to, struct stat *sbp); +static int copy_mv(rtems_shell_mv_globals* globals, char *from, char *to); +static void usage_mv(rtems_shell_mv_globals* globals); + +/* RTEMS changes */ + +int +main_mv(rtems_shell_mv_globals* globals, int argc, char *argv[]) +{ + int ch, len, rval; + char *p, *endp; + struct stat sb; + char path[MAXPATHLEN + 1]; + size_t baselen; + + struct getopt_data getopt_reent; + memset(&getopt_reent, 0, sizeof(getopt_data)); + +/* setprogname(argv[0]); */ + + (void)setlocale(LC_ALL, ""); + + while ((ch = getopt_r(argc, argv, "ifv", &getopt_reent)) != -1) + switch (ch) { + case 'i': + fflg = 0; + iflg = 1; + break; + case 'f': + iflg = 0; + fflg = 1; + break; + case 'v': + vflg = 1; + break; + default: + usage(); + } + argc -= getopt_reent.optind; + argv += getopt_reent.optind; + + if (argc < 2) + usage(); + + stdin_ok = isatty(STDIN_FILENO); + + /* + * If the stat on the target fails or the target isn't a directory, + * try the move. More than 2 arguments is an error in this case. + */ + if (stat(argv[argc - 1], &sb) || !S_ISDIR(sb.st_mode)) { + if (argc > 2) + usage(); + exit(do_move(argv[0], argv[1])); + } + + /* It's a directory, move each file into it. */ + baselen = strlcpy(path, argv[argc - 1], sizeof(path)); + if (baselen >= sizeof(path)) + errx(exit_jump, 1, "%s: destination pathname too long", argv[argc - 1]); + endp = &path[baselen]; + if (!baselen || *(endp - 1) != '/') { + *endp++ = '/'; + ++baselen; + } + for (rval = 0; --argc; ++argv) { + p = *argv + strlen(*argv) - 1; + while (*p == '/' && p != *argv) + *p-- = '\0'; + if ((p = strrchr(*argv, '/')) == NULL) + p = *argv; + else + ++p; + + if ((baselen + (len = strlen(p))) >= MAXPATHLEN) { + warnx("%s: destination pathname too long", *argv); + rval = 1; + } else { + memmove(endp, p, len + 1); + if (do_move(*argv, path)) + rval = 1; + } + } + return rval; +} + +int +do_move_mv(rtems_shell_mv_globals* globals, char *from, char *to) +{ + struct stat sb; + char modep[15]; + + /* + * (1) If the destination path exists, the -f option is not specified + * and either of the following conditions are true: + * + * (a) The permissions of the destination path do not permit + * writing and the standard input is a terminal. + * (b) The -i option is specified. + * + * the mv utility shall write a prompt to standard error and + * read a line from standard input. If the response is not + * affirmative, mv shall do nothing more with the current + * source file... + */ + if (!fflg && !access(to, F_OK)) { + int ask = 1; + int ch; + + if (iflg) { + if (access(from, F_OK)) { + warn("rename %s", from); + return (1); + } + (void)fprintf(stderr, "overwrite %s? ", to); + } else if (stdin_ok && access(to, W_OK) && !stat(to, &sb)) { + if (access(from, F_OK)) { + warn("rename %s", from); + return (1); + } + strmode(sb.st_mode, modep); + (void)fprintf(stderr, "override %s%s%s/%s for %s? ", + modep + 1, modep[9] == ' ' ? "" : " ", + user_from_uid(sb.st_uid, 0), + group_from_gid(sb.st_gid, 0), to); + } else + ask = 0; + if (ask) { + if ((ch = getchar()) != EOF && ch != '\n') { + int ch2; + while ((ch2 = getchar()) != EOF && ch2 != '\n') + continue; + } + if (ch != 'y' && ch != 'Y') + return (0); + } + } + + /* + * (2) If rename() succeeds, mv shall do nothing more with the + * current source file. If it fails for any other reason than + * EXDEV, mv shall write a diagnostic message to the standard + * error and do nothing more with the current source file. + * + * (3) If the destination path exists, and it is a file of type + * directory and source_file is not a file of type directory, + * or it is a file not of type directory, and source file is + * a file of type directory, mv shall write a diagnostic + * message to standard error, and do nothing more with the + * current source file... + */ + if (!rename(from, to)) { + if (vflg) + printf("%s -> %s\n", from, to); + return (0); + } + + if (errno != EXDEV) { + warn("rename %s to %s", from, to); + return (1); + } + + /* + * (4) If the destination path exists, mv shall attempt to remove it. + * If this fails for any reason, mv shall write a diagnostic + * message to the standard error and do nothing more with the + * current source file... + */ + if (!lstat(to, &sb)) { + if ((S_ISDIR(sb.st_mode)) ? rmdir(to) : unlink(to)) { + warn("can't remove %s", to); + return (1); + } + } + + /* + * (5) The file hierarchy rooted in source_file shall be duplicated + * as a file hierarchy rooted in the destination path... + */ + if (lstat(from, &sb)) { + warn("%s", from); + return (1); + } + + return (S_ISREG(sb.st_mode) ? + fastcopy(from, to, &sb) : copy(from, to)); +} + +int +fastcopy_mv(rtems_shell_mv_globals* globals, char *from, char *to, struct stat *sbp) +{ + struct timeval tval[2]; + uint32_t blen; + static char *bp; + int nread, from_fd, to_fd; + + blen = 0; + + if ((from_fd = open(from, O_RDONLY, 0)) < 0) { + warn("%s", from); + return (1); + } + if ((to_fd = + open(to, O_CREAT | O_TRUNC | O_WRONLY, sbp->st_mode)) < 0) { + warn("%s", to); + (void)close(from_fd); + return (1); + } + if (!blen && !(bp = malloc(blen = sbp->st_blksize))) { + warn(NULL); + blen = 0; + (void)close(from_fd); + (void)close(to_fd); + return (1); + } + while ((nread = read(from_fd, bp, blen)) > 0) + if (write(to_fd, bp, nread) != nread) { + warn("%s", to); + goto err; + } + if (nread < 0) { + warn("%s", from); +err: if (unlink(to)) + warn("%s: remove", to); + (void)free(bp); + (void)close(from_fd); + (void)close(to_fd); + return (1); + } + + (void)free(bp); + (void)close(from_fd); +#ifdef xBSD4_4 + TIMESPEC_TO_TIMEVAL(&tval[0], &sbp->st_atimespec); + TIMESPEC_TO_TIMEVAL(&tval[1], &sbp->st_mtimespec); +#else + tval[0].tv_sec = sbp->st_atime; + tval[1].tv_sec = sbp->st_mtime; + tval[0].tv_usec = 0; + tval[1].tv_usec = 0; +#endif +#if 0 +#ifdef _SRV5 + if (utimes(to, tval)) +#else + if (futimes(to_fd, tval)) +#endif + warn("%s: set times", to); +#endif + if (fchown(to_fd, sbp->st_uid, sbp->st_gid)) { + if (errno != EPERM) + warn("%s: set owner/group", to); + sbp->st_mode &= ~(S_ISUID | S_ISGID); + } + if (fchmod(to_fd, sbp->st_mode)) + warn("%s: set mode", to); +#if 0 + if (fchflags(to_fd, sbp->st_flags) && (errno != EOPNOTSUPP)) + warn("%s: set flags (was: 0%07o)", to, sbp->st_flags); +#endif + if (close(to_fd)) { + warn("%s", to); + return (1); + } + + if (unlink(from)) { + warn("%s: remove", from); + return (1); + } + + if (vflg) + printf("%s -> %s\n", from, to); + + return (0); +} + +int +copy_mv(rtems_shell_mv_globals* globals, char *from, char *to) +{ + char* cp_argv[5] = { "mv", vflg ? "-PRpv" : "-PRp", "--", from, to }; + char* rm_argv[4] = { "mv", "-rf", "--", from }; + int result; + + result = rtems_shell_main_cp(5, cp_argv); + if (result) { + warnx("%s: did not terminate normally", _PATH_CP); + return (1); + } + result = rtems_shell_main_rm(4, rm_argv); + if (result) { + warnx("%s: did not terminate normally", _PATH_RM); + return (1); + } +#if 0 + pid_t pid; + int status; + + if ((pid = vfork()) == 0) { + execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", "--", from, to, NULL); + warn("%s", _PATH_CP); + _exit(1); + } + if (waitpid(pid, &status, 0) == -1) { + warn("%s: waitpid", _PATH_CP); + return (1); + } + if (!WIFEXITED(status)) { + warnx("%s: did not terminate normally", _PATH_CP); + return (1); + } + if (WEXITSTATUS(status)) { + warnx("%s: terminated with %d (non-zero) status", + _PATH_CP, WEXITSTATUS(status)); + return (1); + } + if (!(pid = vfork())) { + execl(_PATH_RM, "mv", "-rf", "--", from, NULL); + warn("%s", _PATH_RM); + _exit(1); + } + if (waitpid(pid, &status, 0) == -1) { + warn("%s: waitpid", _PATH_RM); + return (1); + } + if (!WIFEXITED(status)) { + warnx("%s: did not terminate normally", _PATH_RM); + return (1); + } + if (WEXITSTATUS(status)) { + warnx("%s: terminated with %d (non-zero) status", + _PATH_RM, WEXITSTATUS(status)); + return (1); + } +#endif + return (0); +} + +void +usage_mv(rtems_shell_mv_globals* globals) +{ + (void)fprintf(stderr, "usage: %s [-fiv] source target\n" + " %s [-fiv] source ... directory\n", + "mv", "mv"); + exit(1); + /* NOTREACHED */ +} + +rtems_shell_cmd_t rtems_shell_MV_Command = { + "mv", /* name */ + "[-fiv] source target ...", /* usage */ + "files", /* topic */ + rtems_shell_main_mv, /* command */ + NULL, /* alias */ + NULL /* next */ +}; diff --git a/cpukit/libmisc/shell/pathnames-mv.h b/cpukit/libmisc/shell/pathnames-mv.h new file mode 100644 index 0000000000..a38e4e9450 --- /dev/null +++ b/cpukit/libmisc/shell/pathnames-mv.h @@ -0,0 +1,40 @@ +/* $NetBSD: pathnames.h,v 1.8 2004/08/19 22:26:07 christos Exp $ */ + +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 + */ + +#ifdef RESCUEDIR +#define _PATH_RM RESCUEDIR "/rm" +#define _PATH_CP RESCUEDIR "/cp" +#else +#define _PATH_RM "/bin/rm" +#define _PATH_CP "/bin/cp" +#endif diff --git a/cpukit/libmisc/shell/shellconfig.h b/cpukit/libmisc/shell/shellconfig.h index 85b4f03960..8b34cd04d4 100644 --- a/cpukit/libmisc/shell/shellconfig.h +++ b/cpukit/libmisc/shell/shellconfig.h @@ -47,6 +47,7 @@ extern rtems_shell_cmd_t rtems_shell_CHROOT_Command; extern rtems_shell_cmd_t rtems_shell_CHMOD_Command; extern rtems_shell_cmd_t rtems_shell_CAT_Command; extern rtems_shell_cmd_t rtems_shell_MSDOSFMT_Command; +extern rtems_shell_cmd_t rtems_shell_MV_Command; extern rtems_shell_cmd_t rtems_shell_RM_Command; extern rtems_shell_cmd_t rtems_shell_UMASK_Command; extern rtems_shell_cmd_t rtems_shell_MOUNT_Command; @@ -270,6 +271,11 @@ extern rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[]; &rtems_shell_MSDOSFMT_Command, #endif #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_MV)) || \ + defined(CONFIGURE_SHELL_COMMAND_MV) + &rtems_shell_MV_Command, + #endif + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ !defined(CONFIGURE_SHELL_NO_COMMAND_RM)) || \ defined(CONFIGURE_SHELL_COMMAND_RM) &rtems_shell_RM_Command, |