Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added "--ignore-attributes" switch to the "cp" command.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24330 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2008-03-09 17:40:04 +00:00
parent 2586d10ea9
commit 0006905bfb
1 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/tools/fs_shell/command_cp.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2005-2007, Ingo Weinhold, bonefish@cs.tu-berlin.de.
* Copyright 2005-2008, Ingo Weinhold, ingo_weinhold@gmx.de.
* Distributed under the terms of the MIT License.
*/
@ -38,6 +38,7 @@ static const int sCopyBufferSize = 64 * 1024; // 64 KB
struct Options {
Options()
: attributesOnly(false),
ignoreAttributes(false),
dereference(true),
force(false),
recursive(false)
@ -45,6 +46,7 @@ struct Options {
}
bool attributesOnly;
bool ignoreAttributes;
bool dereference;
bool force;
bool recursive;
@ -1189,9 +1191,11 @@ copy_entry(FSDomain *sourceDomain, const char *source,
targetDeleter.SetTo(targetNode);
// copy attributes
error = copy_attributes(source, sourceNode, target, targetNode);
if (error != FSSH_B_OK)
return error;
if (!options.ignoreAttributes) {
error = copy_attributes(source, sourceNode, target, targetNode);
if (error != FSSH_B_OK)
return error;
}
// copy contents
if (sourceNode->IsFile()) {
@ -1224,27 +1228,36 @@ command_cp(int argc, const char* const* argv)
const char *arg = argv[argi];
if (arg[0] == '-') {
if (arg[1] == '\0') {
fprintf(stderr, "Error: Invalid option `-'\n");
fprintf(stderr, "Error: Invalid option '-'\n");
return FSSH_EINVAL;
}
for (int i = 1; arg[i]; i++) {
switch (arg[i]) {
case 'a':
options.attributesOnly = true;
case 'd':
options.dereference = false;
break;
case 'f':
options.force = true;
break;
case 'r':
options.recursive = true;
break;
default:
fprintf(stderr, "Error: Unknown option `-%c'\n",
arg[i]);
return FSSH_EINVAL;
if (arg[1] == '-') {
if (strcmp(arg, "--ignore-attributes") == 0) {
options.ignoreAttributes = true;
} else {
fprintf(stderr, "Error: Unknown option '%s'\n", arg);
return FSSH_EINVAL;
}
} else {
for (int i = 1; arg[i]; i++) {
switch (arg[i]) {
case 'a':
options.attributesOnly = true;
case 'd':
options.dereference = false;
break;
case 'f':
options.force = true;
break;
case 'r':
options.recursive = true;
break;
default:
fprintf(stderr, "Error: Unknown option '-%c'\n",
arg[i]);
return FSSH_EINVAL;
}
}
}
} else {