Ignore unsupported cp --preserve option.
This commit is contained in:
parent
58c7070134
commit
0329192ba8
|
@ -372,6 +372,7 @@ int main(int argc, char* argv[])
|
||||||
const char* argv0 = argv[0];
|
const char* argv0 = argv[0];
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
const char* target_directory = NULL;
|
const char* target_directory = NULL;
|
||||||
|
const char* preserve_list = NULL;
|
||||||
for ( int i = 1; i < argc; i++ )
|
for ( int i = 1; i < argc; i++ )
|
||||||
{
|
{
|
||||||
const char* arg = argv[i];
|
const char* arg = argv[i];
|
||||||
|
@ -410,6 +411,7 @@ int main(int argc, char* argv[])
|
||||||
break;
|
break;
|
||||||
case 'T': flags |= FLAG_NO_TARGET_DIR; break;
|
case 'T': flags |= FLAG_NO_TARGET_DIR; break;
|
||||||
case 'u': flags |= FLAG_UPDATE; break;
|
case 'u': flags |= FLAG_UPDATE; break;
|
||||||
|
case 'p': preserve_list = "mode,ownership,timestamps"; break;
|
||||||
case 'P': flags |= FLAG_NO_DEREFERENCE; break;
|
case 'P': flags |= FLAG_NO_DEREFERENCE; break;
|
||||||
default:
|
default:
|
||||||
#ifdef CP_PRETEND_TO_BE_INSTALL
|
#ifdef CP_PRETEND_TO_BE_INSTALL
|
||||||
|
@ -431,6 +433,10 @@ int main(int argc, char* argv[])
|
||||||
flags |= FLAG_RECURSIVE;
|
flags |= FLAG_RECURSIVE;
|
||||||
else if ( !strcmp(arg, "--verbose") )
|
else if ( !strcmp(arg, "--verbose") )
|
||||||
flags |= FLAG_VERBOSE;
|
flags |= FLAG_VERBOSE;
|
||||||
|
else if ( !strcmp(arg, "--preserve") )
|
||||||
|
preserve_list = "mode,ownership,timestamps";
|
||||||
|
else if ( !strncmp(arg, "--preserve=", strlen("--preserve=")) )
|
||||||
|
preserve_list = arg + strlen("--preserve=");
|
||||||
else if ( !strcmp(arg, "--target-directory") )
|
else if ( !strcmp(arg, "--target-directory") )
|
||||||
{
|
{
|
||||||
if ( i + 1 == argc )
|
if ( i + 1 == argc )
|
||||||
|
@ -469,6 +475,9 @@ int main(int argc, char* argv[])
|
||||||
if ( (flags & FLAG_TARGET_DIR) && (flags & FLAG_NO_TARGET_DIR) )
|
if ( (flags & FLAG_TARGET_DIR) && (flags & FLAG_NO_TARGET_DIR) )
|
||||||
error(1, 0, "cannot combine --target-directory (-t) and --no-target-directory (-T)");
|
error(1, 0, "cannot combine --target-directory (-t) and --no-target-directory (-T)");
|
||||||
|
|
||||||
|
// TODO: Actually preserve.
|
||||||
|
(void) preserve_list;
|
||||||
|
|
||||||
compact_arguments(&argc, &argv);
|
compact_arguments(&argc, &argv);
|
||||||
|
|
||||||
if ( argc < 2 )
|
if ( argc < 2 )
|
||||||
|
|
Loading…
Reference in New Issue