On Tuesday 06 January 2009 17:32:59 Kamil Dudka wrote:
> On Tuesday 06 January 2009 16:50:19 you wrote:
> > A couple of tweaks needed I think:
> >
> > a
> > The @option{-i} option overrides previous @option{-n} option
> > ^
> > Same tweak suggested for both the cp usage() function.
> >
> > In the tests you set LC_ALL=C explicitly.
> > I don't think this is necessary as the locale
> > is set to C by default (using the tests/lang-default script).
>
> Ok, thanks. Attaching new version of patch.
>
>
> Kamil
Sorry for typo in documentation. Fixed patch attached.
Kamil
From f3871baada9c3a4346ea9bbf9585ce980a6ecbd2 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <[email protected]>
Date: Tue, 6 Jan 2009 17:37:39 +0100
Subject: [PATCH] cp/mv: add -n option to not overwrite target
* src/cp.c (usage): Show new option -n in --help.
(main): Handle new option -n.
* src/mv.c (usage): Show new option -n in --help.
(main): Handle new option -n.
* doc/coreutils.texi: Document new cp/mv option -n.
* tests/cp/cp-i: Add tests for -f, -i and -n options.
* tests/mv/mv-n: New test for mv -n.
* tests/Makefile.am: Add test mv/mv-n to the list.
* NEWS: Mention the change.
---
NEWS | 2 +
doc/coreutils.texi | 26 +++++++++++++++++++++-
src/cp.c | 15 ++++++++++--
src/mv.c | 15 ++++++++++--
tests/Makefile.am | 1 +
tests/cp/cp-i | 33 +++++++++++++++++++++++++++++
tests/mv/mv-n | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 142 insertions(+), 8 deletions(-)
create mode 100755 tests/mv/mv-n
diff --git a/NEWS b/NEWS
index f605330..05b8ff1 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ GNU coreutils NEWS -*- outline -*-
** New features
+ cp/mv new option -n to not overwrite target
+
dd accepts iflag=cio and oflag=cio to open the file in CIO (concurrent I/O)
mode where this feature is available.
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 51145de..4b8a85c 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -7314,6 +7314,9 @@ description of @option{--remove-destination}.
This option is independent of the @option{--interactive} or
@option{-i} option: neither cancels the effect of the other.
+This option is redundant if the @option{--no-replace} or @option{-n} option is
+used.
+
@item -H
@opindex -H
If a command line argument specifies a symbolic link, then copy the
@@ -7326,7 +7329,8 @@ via recursive traversal.
@opindex -i
@opindex --interactive
When copying a file other than a directory, prompt whether to
-overwrite an existing destination file.
+overwrite an existing destination file. The @option{-i} option overrides
+a previous @option{-n} option.
@item -l
@itemx --link
@@ -7340,6 +7344,13 @@ Make hard links instead of copies of non-directories.
@opindex --dereference
Follow symbolic links when copying from them.
+...@item -n
+...@itemx --no-replace
+...@opindex -n
+...@opindex --no-replace
+Do not overwrite an existing file. The @option{-n} option overrides a previous
+...@option{-i} option.
+
@item -P
@itemx --no-dereference
@opindex -P
@@ -8098,7 +8109,8 @@ The program accepts the following options. Also see @ref{Common options}.
@opindex -f
@opindex --force
@cindex prompts, omitting
-Do not prompt the user before removing a destination file.
+Do not prompt the user before removing a destination file. The @option{-f}
+option overrides any previous @option{-i} or @option{-n} options.
@item -i
@itemx --interactive
@@ -8108,6 +8120,16 @@ Do not prompt the user before removing a destination file.
Prompt whether to overwrite each existing destination file, regardless
of its permissions.
If the response is not affirmative, the file is skipped.
+The @option{-i} option overrides any previous @option{-f} or @option{-n}
+options.
+
+...@item -n
+...@itemx --no-replace
+...@opindex -n
+...@opindex --no-replace
+...@cindex prompts, omitting
+Do not overwrite an existing file. The @option{-n} option overrides any
+previous @option{-f} or @option{-i} options.
@item -u
@itemx --update
diff --git a/src/cp.c b/src/cp.c
index 8e34965..2a17e05 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -118,6 +118,7 @@ static struct option const long_opts[] =
{"link", no_argument, NULL, 'l'},
{"no-dereference", no_argument, NULL, 'P'},
{"no-preserve", required_argument, NULL, NO_PRESERVE_ATTRIBUTES_OPTION},
+ {"no-replace", no_argument, NULL, 'n'},
{"no-target-directory", no_argument, NULL, 'T'},
{"one-file-system", no_argument, NULL, 'x'},
{"parents", no_argument, NULL, PARENTS_OPTION},
@@ -167,8 +168,10 @@ Mandatory arguments to long options are mandatory for short options too.\n\
"), stdout);
fputs (_("\
-f, --force if an existing destination file cannot be\n\
- opened, remove it and try again\n\
- -i, --interactive prompt before overwrite\n\
+ opened, remove it and try again (The -f option\n\
+ is redundant if the -n option is used.)\n\
+ -i, --interactive prompt before overwrite (The -i option\n\
+ overrides a previous -n option.)\n\
-H follow command-line symbolic links in SOURCE\n\
"), stdout);
fputs (_("\
@@ -176,6 +179,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
-L, --dereference always follow symbolic links in SOURCE\n\
"), stdout);
fputs (_("\
+ -n, --no-replace do not overwrite an existing file (The -n\n\
+ option overrides a previous -i option.)\n\
-P, --no-dereference never follow symbolic links in SOURCE\n\
"), stdout);
fputs (_("\
@@ -894,7 +899,7 @@ main (int argc, char **argv)
we'll actually use backup_suffix_string. */
backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
- while ((c = getopt_long (argc, argv, "abdfHilLprst:uvxPRS:T",
+ while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:T",
long_opts, NULL))
!= -1)
{
@@ -950,6 +955,10 @@ main (int argc, char **argv)
x.dereference = DEREF_ALWAYS;
break;
+ case 'n':
+ x.interactive = I_ALWAYS_NO;
+ break;
+
case 'P':
x.dereference = DEREF_NEVER;
break;
diff --git a/src/mv.c b/src/mv.c
index 98309a4..635c4e0 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -62,6 +62,7 @@ static struct option const long_options[] =
{"backup", optional_argument, NULL, 'b'},
{"force", no_argument, NULL, 'f'},
{"interactive", no_argument, NULL, 'i'},
+ {"no-replace", no_argument, NULL, 'n'},
{"no-target-directory", no_argument, NULL, 'T'},
{"strip-trailing-slashes", no_argument, NULL, STRIP_TRAILING_SLASHES_OPTION},
{"suffix", required_argument, NULL, 'S'},
@@ -294,8 +295,13 @@ Mandatory arguments to long options are mandatory for short options too.\n\
fputs (_("\
--backup[=CONTROL] make a backup of each existing destination file\n\
-b like --backup but does not accept an argument\n\
- -f, --force do not prompt before overwriting\n\
- -i, --interactive prompt before overwrite\n\
+ -f, --force do not prompt before overwriting (The -f option\n\
+ overrides any previous -i or -n options.)\n\
+ -i, --interactive prompt before overwrite (The -i option\n\
+ overrides any previous -f or -n options.)\n\
+ -n, --no-replace do not overwrite an existing file (The -n\n\
+ option overrides any previous -f or -i\n\
+ options.)\n\
"), stdout);
fputs (_("\
--strip-trailing-slashes remove any trailing slashes from each SOURCE\n\
@@ -358,7 +364,7 @@ main (int argc, char **argv)
we'll actually use backup_suffix_string. */
backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
- while ((c = getopt_long (argc, argv, "bfit:uvS:T", long_options, NULL))
+ while ((c = getopt_long (argc, argv, "bfint:uvS:T", long_options, NULL))
!= -1)
{
switch (c)
@@ -374,6 +380,9 @@ main (int argc, char **argv)
case 'i':
x.interactive = I_ASK_USER;
break;
+ case 'n':
+ x.interactive = I_ALWAYS_NO;
+ break;
case STRIP_TRAILING_SLASHES_OPTION:
remove_trailing_slashes = true;
break;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8dbbe9f..6dce9cd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -379,6 +379,7 @@ TESTS = \
mv/into-self-3 \
mv/into-self-4 \
mv/leak-fd \
+ mv/mv-n \
mv/mv-special-1 \
mv/no-target-dir \
mv/part-fail \
diff --git a/tests/cp/cp-i b/tests/cp/cp-i
index 94284be..0846c43 100755
--- a/tests/cp/cp-i
+++ b/tests/cp/cp-i
@@ -31,4 +31,37 @@ fail=0
# coreutils 6.2 cp would neglect to prompt in this case.
echo n | cp -iR a b 2>/dev/null || fail=1
+# test miscellaneous combinations of -f -i -n parameters
+touch c d || framework_failure
+echo "\`c' -> \`d'" > out_copy
+> out_empty
+
+# ask for overwrite, answer no
+echo n | cp -vi c d 2>/dev/null > out1 || fail=1
+compare out1 out_empty || fail=1
+
+# ask for overwrite, answer yes
+echo y | cp -vi c d 2>/dev/null > out2 || fail=1
+compare out2 out_copy || fail=1
+
+# -i wins over -n
+echo y | cp -vni c d 2>/dev/null > out3 || fail=1
+compare out3 out_copy || fail=1
+
+# -n wins over -i
+echo y | cp -vin c d 2>/dev/null > out4 || fail=1
+compare out4 out_empty || fail=1
+
+# ask for overwrite, answer yes
+echo y | cp -vfi c d 2>/dev/null > out5 || fail=1
+compare out5 out_copy || fail=1
+
+# do not ask, prevent from overwrite
+echo n | cp -vfn c d 2>/dev/null > out6 || fail=1
+compare out6 out_empty || fail=1
+
+# do not ask, prevent from overwrite
+echo n | cp -vnf c d 2>/dev/null > out7 || fail=1
+compare out7 out_empty || fail=1
+
Exit $fail
diff --git a/tests/mv/mv-n b/tests/mv/mv-n
new file mode 100755
index 0000000..02dbcfa
--- /dev/null
+++ b/tests/mv/mv-n
@@ -0,0 +1,58 @@
+#!/bin/sh
+# Test whether mv -n works as documented (not overwrite target).
+
+# Copyright (C) 2006-2008 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+if test "$VERBOSE" = yes; then
+ set -x
+ mv --version
+fi
+
+. $srcdir/test-lib.sh
+
+fail=0
+
+# test miscellaneous combinations of -f -i -n parameters
+touch a b || framework_failure
+echo "\`a' -> \`b'" > out_move
+> out_empty
+
+# ask for overwrite, answer no
+touch a b || framework_failure
+echo n | mv -vi a b 2>/dev/null > out1 || fail=1
+compare out1 out_empty || fail=1
+
+# ask for overwrite, answer yes
+touch a b || framework_failure
+echo y | mv -vi a b 2>/dev/null > out2 || fail=1
+compare out2 out_move || fail=1
+
+# -n wins (as the last option)
+touch a b || framework_failure
+echo y | mv -vin a b 2>/dev/null > out3 || fail=1
+compare out3 out_empty || fail=1
+
+# -n wins (as the last option)
+touch a b || framework_failure
+echo y | mv -vfn a b 2>/dev/null > out4 || fail=1
+compare out4 out_empty || fail=1
+
+# -n wins (as the last option)
+touch a b || framework_failure
+echo y | mv -vifn a b 2>/dev/null > out5 || fail=1
+compare out5 out_empty || fail=1
+
+Exit $fail
--
1.5.4.3
_______________________________________________
Bug-coreutils mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/bug-coreutils
