summaryrefslogtreecommitdiff
path: root/utility.c
diff options
context:
space:
mode:
authorErik Andersen1999-12-29 02:10:35 +0000
committerErik Andersen1999-12-29 02:10:35 +0000
commit2fe08c7afb3ddef42f304e78cb6edfa28e0741ef (patch)
tree2c44125f9324373494668c513c31be2a172a54d4 /utility.c
parent00266d3df6ba8dcc6247f112372a0ce5a8ab2c32 (diff)
downloadbusybox-2fe08c7afb3ddef42f304e78cb6edfa28e0741ef.zip
busybox-2fe08c7afb3ddef42f304e78cb6edfa28e0741ef.tar.gz
Fixed cp so it works as God intended it to.
-Erik
Diffstat (limited to 'utility.c')
-rw-r--r--utility.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/utility.c b/utility.c
index d01be9c..d042b99 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,