aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--coreutils/cp.c40
-rw-r--r--coreutils/mv.c42
-rw-r--r--cp.c40
-rw-r--r--findutils/grep.c2
-rw-r--r--grep.c2
-rw-r--r--mv.c42
-rw-r--r--utility.c5
8 files changed, 122 insertions, 53 deletions
diff --git a/Makefile b/Makefile
index 73aa2fc90..4215b291b 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ BUILDTIME=$(shell date "+%Y%m%d-%H%M")
# Comment out the following to make a debuggable build
# Leave this off for production use.
-DODEBUG=false
+DODEBUG=true
# If you want a static binary, turn this on. I can't think
# of many situations where anybody would ever want it static,
# but...
diff --git a/coreutils/cp.c b/coreutils/cp.c
index ce632016e..1e10f2868 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -42,26 +42,36 @@ static int followLinks = FALSE;
static int preserveFlag = FALSE;
static const char *srcName;
static const char *destName;
-static const char *skipName;
-static int dirFlag = FALSE;
-
+static int destDirFlag = FALSE;
+static int destExistsFlag = FALSE;
+static int srcDirFlag = FALSE;
static int fileAction(const char *fileName, struct stat* statbuf)
{
char newdestName[NAME_MAX];
+
strcpy(newdestName, destName);
- if (dirFlag==TRUE) {
- strcat(newdestName, "/");
- if ( skipName != NULL)
- strcat(newdestName, strstr(fileName, skipName));
- else
- strcat(newdestName, srcName);
+ if ( srcDirFlag == TRUE ) {
+ if (recursiveFlag!=TRUE ) {
+ fprintf(stderr, "cp: %s: omitting directory\n", srcName);
+ return( TRUE);
+ }
+ strcat(newdestName, strstr(fileName, srcName) + strlen(srcName));
+ }
+
+ if (destDirFlag==TRUE && srcDirFlag == FALSE) {
+ if (newdestName[strlen(newdestName)-1] != '/' ) {
+ strcat(newdestName, "/");
+ }
+ strcat(newdestName, srcName);
}
+
return (copyFile(fileName, newdestName, preserveFlag, followLinks));
}
extern int cp_main(int argc, char **argv)
{
+ struct stat statBuf;
if (argc < 3) {
usage (cp_usage);
@@ -96,18 +106,20 @@ extern int cp_main(int argc, char **argv)
destName = argv[argc - 1];
- dirFlag = isDirectory(destName);
+ if (stat(destName, &statBuf) >= 0) {
+ destExistsFlag = TRUE;
+ if (S_ISDIR(statBuf.st_mode))
+ destDirFlag = TRUE;
+ }
- if ((argc > 3) && dirFlag==FALSE) {
+ if ((argc > 3) && destDirFlag==FALSE) {
fprintf(stderr, "%s: not a directory\n", destName);
exit (FALSE);
}
while (argc-- > 1) {
srcName = *(argv++);
- skipName = strrchr(srcName, '/');
- if (skipName)
- skipName++;
+ srcDirFlag = isDirectory(srcName);
if (recursiveAction(srcName, recursiveFlag, followLinks, FALSE,
fileAction, fileAction) == FALSE) {
exit( FALSE);
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 2be3961ca..d0f346196 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -35,13 +35,25 @@ static const char mv_usage[] = "mv SOURCE DEST\n"
static const char *srcName;
static const char *destName;
-static const char *skipName;
static int dirFlag = FALSE;
+static int fileAction(const char *fileName, struct stat* statbuf)
+{
+ char newdestName[NAME_MAX];
+
+ fprintf(stderr, "srcName='%s' destName='%s'\n", srcName, destName);
+ strcpy(newdestName, destName);
+ strcat(newdestName, "/");
+ strcat(newdestName, strstr(fileName, fileName));
+ fprintf(stderr, "newdestName='%s'\n", newdestName);
+ return (copyFile(fileName, newdestName, TRUE, TRUE));
+}
+
extern int mv_main(int argc, char **argv)
{
char newdestName[NAME_MAX];
+ char *skipName;
if (argc < 3) {
usage (mv_usage);
@@ -69,16 +81,26 @@ extern int mv_main(int argc, char **argv)
strcat(newdestName, strstr(srcName, skipName));
else
strcat(newdestName, srcName);
- fprintf(stderr, "srcName='%s'\n", srcName);
- fprintf(stderr, "skipName='%s'\n", skipName);
- fprintf(stderr, "newdestName='%s'\n", newdestName);
- }
- if (copyFile(srcName, newdestName, FALSE, FALSE) == FALSE) {
- exit( FALSE);
}
- if (unlink (srcName) < 0) {
- perror (srcName);
- exit( FALSE);
+ if (isDirectory(srcName)==TRUE && newdestName[strlen(newdestName)] != '/') {
+ strcat(newdestName, "/");
+ createPath(newdestName, 0777);
+ fprintf(stderr, "srcName = '%s'\n", srcName);
+ fprintf(stderr, "newdestName = '%s'\n", newdestName);
+ if (recursiveAction(srcName, TRUE, TRUE, FALSE,
+ fileAction, fileAction) == FALSE)
+ {
+ exit( FALSE);
+ }
+ exit( TRUE);
+ } else {
+ if (copyFile(srcName, newdestName, FALSE, FALSE) == FALSE) {
+ exit( FALSE);
+ }
+ if (unlink (srcName) < 0) {
+ perror (srcName);
+ exit( FALSE);
+ }
}
}
exit( TRUE);
diff --git a/cp.c b/cp.c
index ce632016e..1e10f2868 100644
--- a/cp.c
+++ b/cp.c
@@ -42,26 +42,36 @@ static int followLinks = FALSE;
static int preserveFlag = FALSE;
static const char *srcName;
static const char *destName;
-static const char *skipName;
-static int dirFlag = FALSE;
-
+static int destDirFlag = FALSE;
+static int destExistsFlag = FALSE;
+static int srcDirFlag = FALSE;
static int fileAction(const char *fileName, struct stat* statbuf)
{
char newdestName[NAME_MAX];
+
strcpy(newdestName, destName);
- if (dirFlag==TRUE) {
- strcat(newdestName, "/");
- if ( skipName != NULL)
- strcat(newdestName, strstr(fileName, skipName));
- else
- strcat(newdestName, srcName);
+ if ( srcDirFlag == TRUE ) {
+ if (recursiveFlag!=TRUE ) {
+ fprintf(stderr, "cp: %s: omitting directory\n", srcName);
+ return( TRUE);
+ }
+ strcat(newdestName, strstr(fileName, srcName) + strlen(srcName));
+ }
+
+ if (destDirFlag==TRUE && srcDirFlag == FALSE) {
+ if (newdestName[strlen(newdestName)-1] != '/' ) {
+ strcat(newdestName, "/");
+ }
+ strcat(newdestName, srcName);
}
+
return (copyFile(fileName, newdestName, preserveFlag, followLinks));
}
extern int cp_main(int argc, char **argv)
{
+ struct stat statBuf;
if (argc < 3) {
usage (cp_usage);
@@ -96,18 +106,20 @@ extern int cp_main(int argc, char **argv)
destName = argv[argc - 1];
- dirFlag = isDirectory(destName);
+ if (stat(destName, &statBuf) >= 0) {
+ destExistsFlag = TRUE;
+ if (S_ISDIR(statBuf.st_mode))
+ destDirFlag = TRUE;
+ }
- if ((argc > 3) && dirFlag==FALSE) {
+ if ((argc > 3) && destDirFlag==FALSE) {
fprintf(stderr, "%s: not a directory\n", destName);
exit (FALSE);
}
while (argc-- > 1) {
srcName = *(argv++);
- skipName = strrchr(srcName, '/');
- if (skipName)
- skipName++;
+ srcDirFlag = isDirectory(srcName);
if (recursiveAction(srcName, recursiveFlag, followLinks, FALSE,
fileAction, fileAction) == FALSE) {
exit( FALSE);
diff --git a/findutils/grep.c b/findutils/grep.c
index a0457df91..fdfc959af 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -46,7 +46,7 @@ static const char grep_usage[] =
"\t-h\tsuppress the prefixing filename on output\n"
"\t-i\tignore case distinctions\n"
"\t-n\tprint line number with output lines\n"
-"\t-q\tbe quiet\n\n"
+"\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n\n"
#if defined BB_REGEXP
"This version of grep matches full regular expresions.\n";
#else
diff --git a/grep.c b/grep.c
index a0457df91..fdfc959af 100644
--- a/grep.c
+++ b/grep.c
@@ -46,7 +46,7 @@ static const char grep_usage[] =
"\t-h\tsuppress the prefixing filename on output\n"
"\t-i\tignore case distinctions\n"
"\t-n\tprint line number with output lines\n"
-"\t-q\tbe quiet\n\n"
+"\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n\n"
#if defined BB_REGEXP
"This version of grep matches full regular expresions.\n";
#else
diff --git a/mv.c b/mv.c
index 2be3961ca..d0f346196 100644
--- a/mv.c
+++ b/mv.c
@@ -35,13 +35,25 @@ static const char mv_usage[] = "mv SOURCE DEST\n"
static const char *srcName;
static const char *destName;
-static const char *skipName;
static int dirFlag = FALSE;
+static int fileAction(const char *fileName, struct stat* statbuf)
+{
+ char newdestName[NAME_MAX];
+
+ fprintf(stderr, "srcName='%s' destName='%s'\n", srcName, destName);
+ strcpy(newdestName, destName);
+ strcat(newdestName, "/");
+ strcat(newdestName, strstr(fileName, fileName));
+ fprintf(stderr, "newdestName='%s'\n", newdestName);
+ return (copyFile(fileName, newdestName, TRUE, TRUE));
+}
+
extern int mv_main(int argc, char **argv)
{
char newdestName[NAME_MAX];
+ char *skipName;
if (argc < 3) {
usage (mv_usage);
@@ -69,16 +81,26 @@ extern int mv_main(int argc, char **argv)
strcat(newdestName, strstr(srcName, skipName));
else
strcat(newdestName, srcName);
- fprintf(stderr, "srcName='%s'\n", srcName);
- fprintf(stderr, "skipName='%s'\n", skipName);
- fprintf(stderr, "newdestName='%s'\n", newdestName);
- }
- if (copyFile(srcName, newdestName, FALSE, FALSE) == FALSE) {
- exit( FALSE);
}
- if (unlink (srcName) < 0) {
- perror (srcName);
- exit( FALSE);
+ if (isDirectory(srcName)==TRUE && newdestName[strlen(newdestName)] != '/') {
+ strcat(newdestName, "/");
+ createPath(newdestName, 0777);
+ fprintf(stderr, "srcName = '%s'\n", srcName);
+ fprintf(stderr, "newdestName = '%s'\n", newdestName);
+ if (recursiveAction(srcName, TRUE, TRUE, FALSE,
+ fileAction, fileAction) == FALSE)
+ {
+ exit( FALSE);
+ }
+ exit( TRUE);
+ } else {
+ if (copyFile(srcName, newdestName, FALSE, FALSE) == FALSE) {
+ exit( FALSE);
+ }
+ if (unlink (srcName) < 0) {
+ perror (srcName);
+ exit( FALSE);
+ }
}
}
exit( TRUE);
diff --git a/utility.c b/utility.c
index d01be9c98..d042b9910 100644
--- a/utility.c
+++ b/utility.c
@@ -151,7 +151,8 @@ copyFile( const char *srcName, const char *destName,
if (S_ISDIR(srcStatBuf.st_mode)) {
//fprintf(stderr, "copying directory %s to %s\n", srcName, destName);
/* Make sure the directory is writable */
- if (mkdir(destName, 0777777 ^ umask(0))) {
+ result = mkdir(destName, 0777777 ^ umask(0));
+ if (result < 0 && errno != EEXIST) {
perror(destName);
return (FALSE);
}
@@ -478,7 +479,7 @@ recursiveAction(const char *fileName, int recurse, int followLinks, int depthFir
-#if defined (BB_TAR) || defined (BB_MKDIR)
+#if defined (BB_TAR) || defined (BB_MKDIR) || defined (BB_CP)
/*
* Attempt to create the directories along the specified path, except for
* the final component. The mode is given for the final directory only,
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-27 09:21:06 +0000