Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c
[oweals/busybox.git] / cp_mv.c
diff --git a/cp_mv.c b/cp_mv.c
index 8dbc4e8f1062cb5daf95545b58f1049a171d875f..3dc637d7f9f3d8c0b8750261bf4f9a34a5129ab0 100644 (file)
--- a/cp_mv.c
+++ b/cp_mv.c
@@ -37,7 +37,7 @@
 #include <utime.h>
 #include <dirent.h>
 #include <sys/param.h>
-#include <setjmp.h>                            /* Ok to use this since `ash' does, therefore it's in the libc subset already. */
+#include <setjmp.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #define is_cp 0
 #define is_mv 1
 static int         dz_i;               /* index into cp_mv_usage */
-static const char *dz;                 /* dollar zero, .bss */
 static const char *cp_mv_usage[] =     /* .rodata */
 {
        "cp [OPTION]... SOURCE DEST\n"
-               "   or: cp [OPTION]... SOURCE... DIRECTORY\n\n"
-               "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
+               "   or: cp [OPTION]... SOURCE... DIRECTORY\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+               "\nCopies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
                "\n"
-               "\t-a\tsame as -dpR\n"
-               "\t-d\tpreserve links\n"
-               "\t-p\tpreserve file attributes if possible\n"
-               "\t-R\tcopy directories recursively\n",
+               "\t-a\tSame as -dpR\n"
+               "\t-d\tPreserves links\n"
+               "\t-p\tPreserves file attributes if possible\n"
+               "\t-f\tforce (implied; ignored) - always set\n"
+               "\t-R\tCopies directories recursively\n"
+#endif
+               ,
        "mv SOURCE DEST\n"
-               "   or: mv SOURCE... DIRECTORY\n\n"
-               "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
+               "   or: mv SOURCE... DIRECTORY\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+               "\nRename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
+#endif
 };
 
 static int recursiveFlag;
 static int followLinks;
 static int preserveFlag;
+static int forceFlag;
 
 static const char *baseSrcName;
 static int                srcDirFlag;
 static struct stat srcStatBuf;
 
-static char               baseDestName[PATH_MAX + 1];
+static char               baseDestName[BUFSIZ + 1];
 static size_t     baseDestLen;
 static int                destDirFlag;
 static struct stat destStatBuf;
@@ -82,8 +88,8 @@ static void name_too_long__exit (void) __attribute__((noreturn));
 static
 void name_too_long__exit (void)
 {
-       fprintf(stderr, name_too_long, dz);
-       exit FALSE;
+       fprintf(stderr, name_too_long, applet_name);
+       exit(FALSE);
 }
 
 static void
@@ -92,12 +98,12 @@ fill_baseDest_buf(char *_buf, size_t * _buflen) {
        if ((srcBasename = strrchr(baseSrcName, '/')) == NULL) {
                srcBasename = baseSrcName;
                if (_buf[*_buflen - 1] != '/') {
-                       if (++(*_buflen) > PATH_MAX)
+                       if (++(*_buflen) > BUFSIZ)
                                name_too_long__exit();
                        strcat(_buf, "/");
                }
        }
-       if (*_buflen + strlen(srcBasename) > PATH_MAX)
+       if (*_buflen + strlen(srcBasename) > BUFSIZ)
                name_too_long__exit();
        strcat(_buf, srcBasename);
        return;
@@ -105,9 +111,9 @@ fill_baseDest_buf(char *_buf, size_t * _buflen) {
 }
 
 static int
-cp_mv_Action(const char *fileName, struct stat *statbuf)
+cp_mv_Action(const char *fileName, struct stat *statbuf, void* junk)
 {
-       char            destName[PATH_MAX + 1];
+       char            destName[BUFSIZ + 1];
        size_t          destLen;
        const char *srcBasename;
        char       *name;
@@ -117,14 +123,14 @@ cp_mv_Action(const char *fileName, struct stat *statbuf)
 
        if (srcDirFlag == TRUE) {
                if (recursiveFlag == FALSE) {
-                       fprintf(stderr, omitting_directory, dz, baseSrcName);
+                       fprintf(stderr, omitting_directory, applet_name, baseSrcName);
                        return TRUE;
                }
                srcBasename = (strstr(fileName, baseSrcName)
                                           + strlen(baseSrcName));
 
-               if (destLen + strlen(srcBasename) > PATH_MAX) {
-                       fprintf(stderr, name_too_long, dz);
+               if (destLen + strlen(srcBasename) > BUFSIZ) {
+                       fprintf(stderr, name_too_long, applet_name);
                        return FALSE;
                }
                strcat(destName, srcBasename);
@@ -139,7 +145,7 @@ cp_mv_Action(const char *fileName, struct stat *statbuf)
                mv_Action_first_time = errno = 0;
                if (rename(fileName, destName) < 0 && errno != EXDEV) {
                        fprintf(stderr, "%s: rename(%s, %s): %s\n",
-                                       dz, fileName, destName, strerror(errno));
+                                       applet_name, fileName, destName, strerror(errno));
                        goto do_copyFile;       /* Try anyway... */
                }
                else if (errno == EXDEV)
@@ -152,7 +158,7 @@ cp_mv_Action(const char *fileName, struct stat *statbuf)
                if (is_in_ino_dev_hashtable(statbuf, &name)) {
                        if (link(name, destName) < 0) {
                                fprintf(stderr, "%s: link(%s, %s): %s\n",
-                                               dz, name, destName, strerror(errno));
+                                               applet_name, name, destName, strerror(errno));
                                return FALSE;
                        }
                        return TRUE;
@@ -161,21 +167,21 @@ cp_mv_Action(const char *fileName, struct stat *statbuf)
                        add_to_ino_dev_hashtable(statbuf, destName);
                }
        }
-       return copyFile(fileName, destName, preserveFlag, followLinks);
+       return copyFile(fileName, destName, preserveFlag, followLinks, forceFlag);
 }
 
 static int
-rm_Action(const char *fileName, struct stat *statbuf)
+rm_Action(const char *fileName, struct stat *statbuf, void* junk)
 {
        int status = TRUE;
 
        if (S_ISDIR(statbuf->st_mode)) {
                if (rmdir(fileName) < 0) {
-                       fprintf(stderr, "%s: rmdir(%s): %s\n", dz, fileName, strerror(errno));
+                       fprintf(stderr, "%s: rmdir(%s): %s\n", applet_name, fileName, strerror(errno));
                        status = FALSE;
                }
        } else if (unlink(fileName) < 0) {
-               fprintf(stderr, "%s: unlink(%s): %s\n", dz, fileName, strerror(errno));
+               fprintf(stderr, "%s: unlink(%s): %s\n", applet_name, fileName, strerror(errno));
                status = FALSE;
        }
        return status;
@@ -183,8 +189,7 @@ rm_Action(const char *fileName, struct stat *statbuf)
 
 extern int cp_mv_main(int argc, char **argv)
 {
-       dz = *argv;                                     /* already basename'd by busybox.c:main */
-       if (*dz == 'c' && *(dz + 1) == 'p')
+       if (*applet_name == 'c' && *(applet_name + 1) == 'p')
                dz_i = is_cp;
        else
                dz_i = is_mv;
@@ -194,9 +199,9 @@ extern int cp_mv_main(int argc, char **argv)
        argv++;
 
        if (dz_i == is_cp) {
-               recursiveFlag = preserveFlag = FALSE;
+               recursiveFlag = preserveFlag = forceFlag = FALSE;
                followLinks = TRUE;
-               while (**argv == '-') {
+               while (*argv && **argv == '-') {
                        while (*++(*argv)) {
                                switch (**argv) {
                                case 'a':
@@ -213,6 +218,9 @@ extern int cp_mv_main(int argc, char **argv)
                                case 'R':
                                        recursiveFlag = TRUE;
                                        break;
+                               case 'f':
+                                       forceFlag = TRUE;
+                                       break;
                                default:
                                        usage(cp_mv_usage[is_cp]);
                                }
@@ -220,12 +228,16 @@ extern int cp_mv_main(int argc, char **argv)
                        argc--;
                        argv++;
                }
+               if (argc < 2) {
+                       usage(cp_mv_usage[dz_i]);
+               }
        } else {                                        /* (dz_i == is_mv) */
                recursiveFlag = preserveFlag = TRUE;
                followLinks = FALSE;
        }
+       
 
-       if (strlen(argv[argc - 1]) > PATH_MAX) {
+       if (strlen(argv[argc - 1]) > BUFSIZ) {
                fprintf(stderr, name_too_long, "cp");
                goto exit_false;
        }
@@ -247,7 +259,7 @@ extern int cp_mv_main(int argc, char **argv)
 
                baseSrcName = *(argv++);
 
-               if ((srcLen = strlen(baseSrcName)) > PATH_MAX)
+               if ((srcLen = strlen(baseSrcName)) > BUFSIZ)
                        name_too_long__exit();
 
                if (srcLen == 0) continue; /* "" */
@@ -261,21 +273,21 @@ extern int cp_mv_main(int argc, char **argv)
                        int                     state = 0;
                        char            *pushd, *d, *p;
 
-                       if ((pushd = getcwd(NULL, PATH_MAX + 1)) == NULL) {
-                               fprintf(stderr, "%s: getcwd(): %s\n", dz, strerror(errno));
+                       if ((pushd = getcwd(NULL, BUFSIZ + 1)) == NULL) {
+                               fprintf(stderr, "%s: getcwd(): %s\n", applet_name, strerror(errno));
                                continue;
                        }
                        if (chdir(baseDestName) < 0) {
-                               fprintf(stderr, "%s: chdir(%s): %s\n", dz, baseSrcName, strerror(errno));
+                               fprintf(stderr, "%s: chdir(%s): %s\n", applet_name, baseSrcName, strerror(errno));
                                continue;
                        }
-                       if ((d = getcwd(NULL, PATH_MAX + 1)) == NULL) {
-                               fprintf(stderr, "%s: getcwd(): %s\n", dz, strerror(errno));
+                       if ((d = getcwd(NULL, BUFSIZ + 1)) == NULL) {
+                               fprintf(stderr, "%s: getcwd(): %s\n", applet_name, strerror(errno));
                                continue;
                        }
                        while (!state && *d != '\0') {
                                if (stat(d, &sb) < 0) { /* stat not lstat - always dereference targets */
-                                       fprintf(stderr, "%s: stat(%s) :%s\n", dz, d, strerror(errno));
+                                       fprintf(stderr, "%s: stat(%s) :%s\n", applet_name, d, strerror(errno));
                                        state = -1;
                                        continue;
                                }
@@ -284,7 +296,7 @@ extern int cp_mv_main(int argc, char **argv)
                                        fprintf(stderr,
                                                        "%s: Cannot %s `%s' "
                                                        "into a subdirectory of itself, `%s/%s'\n",
-                                                       dz, dz, baseSrcName, baseDestName, baseSrcName);
+                                                       applet_name, applet_name, baseSrcName, baseDestName, baseSrcName);
                                        state = -1;
                                        continue;
                                }
@@ -293,7 +305,7 @@ extern int cp_mv_main(int argc, char **argv)
                                }
                        }
                        if (chdir(pushd) < 0) {
-                               fprintf(stderr, "%s: chdir(%s): %s\n", dz, pushd, strerror(errno));
+                               fprintf(stderr, "%s: chdir(%s): %s\n", applet_name, pushd, strerror(errno));
                                free(pushd);
                                free(d);
                                continue;
@@ -310,19 +322,18 @@ extern int cp_mv_main(int argc, char **argv)
                        mv_Action_first_time = 1;
                        if (recursiveAction(baseSrcName,
                                                                recursiveFlag, followLinks, FALSE,
-                                                               cp_mv_Action, cp_mv_Action) == FALSE) goto exit_false;
+                                                               cp_mv_Action, cp_mv_Action, NULL) == FALSE) goto exit_false;
                        if (dz_i == is_mv &&
                                recursiveAction(baseSrcName,
                                                                recursiveFlag, followLinks, TRUE,
-                                                               rm_Action, rm_Action) == FALSE) goto exit_false;
+                                                               rm_Action, rm_Action, NULL) == FALSE) goto exit_false;
                }               
                if (flags_memo)
                        *(baseDestName + baseDestLen) = '\0';
        }
-// exit_true:
-       exit TRUE;
+       return( TRUE);
  exit_false:
-       exit FALSE;
+       return( FALSE);
 }
 
 /*