emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* cp -fa now works as expected for symlinks (it didn't before)

Browse Source 
* zcat works again (wasn't working since option parsing was broken)
* more doc updates/more support for BB_FEATURE_SIMPLE_HELP
 -Erik
This commit is contained in:
Erik Andersen
2000-05-10 05:05:45 +00:00
parent ac130e1dca
commit 59b9e87024
24 changed files with 135 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cp_mv.c
View File

@@ -70,6 +70,7 @@ static const char *cp_mv_usage[] = /* .rodata */
static int recursiveFlag;
static int followLinks;
static int preserveFlag;
static int forceFlag;
static const char *baseSrcName;
static int srcDirFlag;
@@ -167,7 +168,7 @@ cp_mv_Action(const char *fileName, struct stat *statbuf, void* junk)
add_to_ino_dev_hashtable(statbuf, destName);
}
}
return copyFile(fileName, destName, preserveFlag, followLinks);
return copyFile(fileName, destName, preserveFlag, followLinks, forceFlag);
}
static int
@@ -200,7 +201,7 @@ 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)) {
@@ -220,7 +221,7 @@ extern int cp_mv_main(int argc, char **argv)
recursiveFlag = TRUE;
break;
case 'f':
/* for compatibility; busybox cp/mv always does force */
forceFlag = TRUE;
break;
default:
usage(cp_mv_usage[is_cp]);