*
*/
-#include "internal.h"
+#include "busybox.h"
#define BB_DECLARE_EXTERN
#define bb_need_name_too_long
#define bb_need_omitting_directory
#include <errno.h>
#include <getopt.h>
-#define is_cp 0
-#define is_mv 1
+static const int is_cp = 0;
+static const int is_mv = 1;
static int dz_i; /* index into cp_mv_usage */
-const char cp_usage[] =
- "cp [OPTION]... SOURCE DEST\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\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
- ;
-
-const char mv_usage[] =
- "mv SOURCE DEST\n"
- " or: mv SOURCE... DIRECTORY\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nRename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
-#endif
- ;
-
static const char *cp_mv_usage[] = /* .rodata */
{
cp_usage,
static int srcDirFlag;
static struct stat srcStatBuf;
-static char baseDestName[BUFSIZ + 1];
+static char *pBaseDestName;
static size_t baseDestLen;
static int destDirFlag;
static struct stat destStatBuf;
static
void name_too_long__exit (void)
{
- fatalError(name_too_long);
+ error_msg_and_die(name_too_long);
}
static void
const char *srcBasename;
char *name;
- strcpy(destName, baseDestName);
+ strcpy(destName, pBaseDestName);
destLen = strlen(destName);
if (srcDirFlag == TRUE) {
if (recursiveFlag == FALSE) {
- errorMsg(omitting_directory, baseSrcName);
+ error_msg(omitting_directory, baseSrcName);
return TRUE;
}
srcBasename = (strstr(fileName, baseSrcName)
+ strlen(baseSrcName));
if (destLen + strlen(srcBasename) > BUFSIZ) {
- errorMsg(name_too_long);
+ error_msg(name_too_long);
return FALSE;
}
strcat(destName, srcBasename);
if (mv_Action_first_time && (dz_i == is_mv)) {
mv_Action_first_time = errno = 0;
if (rename(fileName, destName) < 0 && errno != EXDEV) {
- errorMsg("rename(%s, %s): %s\n", fileName, destName,
- strerror(errno));
+ perror_msg("rename(%s, %s)", fileName, destName);
goto do_copyFile; /* Try anyway... */
}
else if (errno == EXDEV)
if (preserveFlag == TRUE && statbuf->st_nlink > 1) {
if (is_in_ino_dev_hashtable(statbuf, &name)) {
if (link(name, destName) < 0) {
- errorMsg("link(%s, %s): %s\n", name, destName, strerror(errno));
+ perror_msg("link(%s, %s)", name, destName);
return FALSE;
}
return TRUE;
add_to_ino_dev_hashtable(statbuf, destName);
}
}
- return copyFile(fileName, destName, preserveFlag, followLinks, forceFlag);
+ return copy_file(fileName, destName, preserveFlag, followLinks, forceFlag);
}
static int
if (S_ISDIR(statbuf->st_mode)) {
if (rmdir(fileName) < 0) {
- errorMsg("rmdir(%s): %s\n", fileName, strerror(errno));
+ perror_msg("rmdir(%s)", fileName);
status = FALSE;
}
} else if (unlink(fileName) < 0) {
- errorMsg("unlink(%s): %s\n", fileName, strerror(errno));
+ perror_msg("unlink(%s)", fileName);
status = FALSE;
}
return status;
{
volatile int i;
int c;
+ RESERVE_BB_BUFFER(baseDestName,BUFSIZ + 1);
+ pBaseDestName = baseDestName; /* available globally */
if (*applet_name == 'c' && *(applet_name + 1) == 'p')
dz_i = is_cp;
usage(cp_mv_usage[dz_i]);
}
} else { /* (dz_i == is_mv) */
+ /* Initialize optind to 1, since in libc5 optind
+ * is not initialized until getopt() is called
+ * (or until sneaky programmers force it...). */
+ optind = 1;
recursiveFlag = preserveFlag = TRUE;
followLinks = FALSE;
}
if (strlen(argv[argc - 1]) > BUFSIZ) {
- errorMsg(name_too_long);
+ error_msg(name_too_long);
goto exit_false;
}
strcpy(baseDestName, argv[argc - 1]);
if (baseDestLen == 0)
goto exit_false;
- destDirFlag = isDirectory(baseDestName, TRUE, &destStatBuf);
- if ((argc > 3) && destDirFlag == FALSE) {
- errorMsg(not_a_directory, baseDestName);
+ destDirFlag = is_directory(baseDestName, TRUE, &destStatBuf);
+ if (argc - optind > 2 && destDirFlag == FALSE) {
+ error_msg(not_a_directory, baseDestName);
goto exit_false;
}
if (srcLen == 0) continue; /* "" */
- srcDirFlag = isDirectory(baseSrcName, followLinks, &srcStatBuf);
+ srcDirFlag = is_directory(baseSrcName, followLinks, &srcStatBuf);
if ((flags_memo = (recursiveFlag == TRUE &&
srcDirFlag == TRUE && destDirFlag == TRUE))) {
char *pushd, *d, *p;
if ((pushd = getcwd(NULL, BUFSIZ + 1)) == NULL) {
- errorMsg("getcwd(): %s\n", strerror(errno));
+ perror_msg("getcwd()");
continue;
}
if (chdir(baseDestName) < 0) {
- errorMsg("chdir(%s): %s\n", baseSrcName, strerror(errno));
+ perror_msg("chdir(%s)", baseSrcName);
continue;
}
if ((d = getcwd(NULL, BUFSIZ + 1)) == NULL) {
- errorMsg("getcwd(): %s\n", strerror(errno));
+ perror_msg("getcwd()");
continue;
}
while (!state && *d != '\0') {
if (stat(d, &sb) < 0) { /* stat not lstat - always dereference targets */
- errorMsg("stat(%s): %s\n", d, strerror(errno));
+ perror_msg("stat(%s)", d);
state = -1;
continue;
}
if ((sb.st_ino == srcStatBuf.st_ino) &&
(sb.st_dev == srcStatBuf.st_dev)) {
- errorMsg("Cannot %s `%s' into a subdirectory of itself, "
+ error_msg("Cannot %s `%s' into a subdirectory of itself, "
"`%s/%s'\n", applet_name, baseSrcName,
baseDestName, baseSrcName);
state = -1;
}
}
if (chdir(pushd) < 0) {
- errorMsg("chdir(%s): %s\n", pushd, strerror(errno));
+ perror_msg("chdir(%s)", pushd);
free(pushd);
free(d);
continue;
status = setjmp(catch);
if (status == 0) {
mv_Action_first_time = 1;
- if (recursiveAction(baseSrcName,
+ if (recursive_action(baseSrcName,
recursiveFlag, followLinks, FALSE,
cp_mv_Action, cp_mv_Action, NULL) == FALSE) goto exit_false;
if (dz_i == is_mv &&
- recursiveAction(baseSrcName,
+ recursive_action(baseSrcName,
recursiveFlag, followLinks, TRUE,
rm_Action, rm_Action, NULL) == FALSE) goto exit_false;
}
if (flags_memo)
*(baseDestName + baseDestLen) = '\0';
}
- return( TRUE);
+ return EXIT_SUCCESS;
exit_false:
- return( FALSE);
+ return EXIT_FAILURE;
}
/*
projects / oweals / busybox.git / blobdiff