diff options
| -rw-r--r-- | lib/backup-files.c | 16 | ||||
| -rw-r--r-- | quilt.changes | 10 | ||||
| -rw-r--r-- | quilt/push.in | 2 |
3 files changed, 18 insertions, 10 deletions
diff --git a/lib/backup-files.c b/lib/backup-files.c index 03628d4..9e6392c 100644 --- a/lib/backup-files.c +++ b/lib/backup-files.c @@ -44,7 +44,7 @@ const char *progname; enum { what_noop, what_backup, what_restore, what_remove }; const char *opt_prefix="", *opt_suffix="", *opt_file; -int opt_silent, opt_what=what_noop, opt_ignore_missing; +int opt_silent, opt_what=what_noop; int opt_nolinks, opt_touch; #define LINE_LENGTH 1024 @@ -53,7 +53,7 @@ int opt_nolinks, opt_touch; void usage(void) { - printf("Usage: %s [-B prefix] [-z suffix] [-f {filelist|-}] [-s] [-b|-r|-x] [-L] {filename|-} ...\n" + printf("Usage: %s [-B prefix] [-z suffix] [-f {file|-}] [-s] [-b|-r|-x] [-L] {file|-} ...\n" "\n" "\tCreate hard linked backup copies of a list of files\n" "\tread from standard input.\n" @@ -64,6 +64,10 @@ usage(void) "\t-B\tPath name prefix for backup files\n" "\t-z\tPath name suffix for backup files\n" "\t-s\tSilent operation; only print error messages\n" + "\t-L\tEnsure that when finished, the source file has a link count of 1\n" + "\t-f\tRead the filenames to process from file (- = standard input)\n" +i "\t-t\tTouch original files after restore (update their mtimes)\n\n" + "\t-L\tEnsure that when finished, the source file has a link count of 1\n\n", progname); } @@ -256,8 +260,6 @@ process_file(const char *file) create_parents(file); if (stat(backup, &st) != 0) { - if (opt_ignore_missing && errno == ENOENT) - return 0; perror(backup); return 1; } @@ -340,7 +342,7 @@ main(int argc, char *argv[]) progname = argv[0]; - while ((opt = getopt(argc, argv, "brxB:z:f:shFLt")) != -1) { + while ((opt = getopt(argc, argv, "brxB:z:f:shLt")) != -1) { switch(opt) { case 'b': opt_what = what_backup; @@ -362,10 +364,6 @@ main(int argc, char *argv[]) opt_file = optarg; break; - case 'F': /* ignore missing input files */ - opt_ignore_missing = 1; - break; - case 'z': opt_suffix = optarg; break; diff --git a/quilt.changes b/quilt.changes index 8c3d8f4..fe339b5 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Jan 27 08:14:34 CET 2005 - agruen@suse.de + +- lib/backup-files.c: Remove unused command line option and + document the remaining options. +- quilt/pop.in: Colorize this as well: + "Patch attempted to create file *, which already exists." + "can't find file to patch at input line *" + "* out of * hunk ignored" + +------------------------------------------------------------------- Tue Jan 25 13:53:23 CET 2005 - agruen@suse.de - Fix pop command for recent coreutils (cp dir dir2/ no longer diff --git a/quilt/push.in b/quilt/push.in index 300f390..4c6558f 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -70,7 +70,7 @@ colorize() { if [ -n "$opt_color" ]; then @AWK@ ' - { if (/FAILED/) + { if (/FAILED|hunk ignored|can'\''t find file|file .* already exists|/) print "'$color_patch_fail'" $0 "'$color_clear'" else if (/^Hunk/) { sub(/^Hunk .* with fuzz [0-9]*/, |