forked from pool/fdupes
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
|
From 299e999ba8ac1916797e4956ee774a46ef11851b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sandro Tosi <morph@debian.org>
|
||
|
|
Date: Fri, 12 Oct 2012 15:06:16 +0200
|
||
|
|
Subject: [PATCH 07/10] Disambiguate the options '--recurse' and '--recurse:'
|
||
|
|
(bts537138)
|
||
|
|
|
||
|
|
---
|
||
|
|
fdupes.1 | 12 +++++++++++-
|
||
|
|
fdupes.c | 3 ++-
|
||
|
|
2 files changed, 13 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/fdupes.1 b/fdupes.1
|
||
|
|
index 5f7c526..9263adc 100644
|
||
|
|
--- a/fdupes.1
|
||
|
|
+++ b/fdupes.1
|
||
|
|
@@ -23,7 +23,8 @@ for every directory given follow subdirectories encountered within
|
||
|
|
.TP
|
||
|
|
.B -R --recurse:
|
||
|
|
for each directory given after this option follow subdirectories
|
||
|
|
-encountered within
|
||
|
|
+encountered within (note the ':' at the end of option; see the
|
||
|
|
+Examples section below for further explanation)
|
||
|
|
.TP
|
||
|
|
.B -s --symlinks
|
||
|
|
follow symlinked directories
|
||
|
|
@@ -85,6 +86,15 @@ or
|
||
|
|
.B --sameline
|
||
|
|
is specified, spaces and backslash characters (\fB\e\fP) appearing
|
||
|
|
in a filename are preceded by a backslash character.
|
||
|
|
+
|
||
|
|
+.SH EXAMPLES
|
||
|
|
+.TP
|
||
|
|
+.B fdupes a --recurse: b
|
||
|
|
+will follow subdirectories under b, but not those under a.
|
||
|
|
+.TP
|
||
|
|
+.B fdupes a --recurse b
|
||
|
|
+will follow subdirectories under both a and b.
|
||
|
|
+
|
||
|
|
.SH CAVEATS
|
||
|
|
If fdupes returns with an error message such as
|
||
|
|
.B fdupes: error invoking md5sum
|
||
|
|
diff --git a/fdupes.c b/fdupes.c
|
||
|
|
index fe540e6..1e9e620 100644
|
||
|
|
--- a/fdupes.c
|
||
|
|
+++ b/fdupes.c
|
||
|
|
@@ -953,7 +953,8 @@ void help_text()
|
||
|
|
printf(" -r --recurse \tfor every directory given follow subdirectories\n");
|
||
|
|
printf(" \tencountered within\n");
|
||
|
|
printf(" -R --recurse: \tfor each directory given after this option follow\n");
|
||
|
|
- printf(" \tsubdirectories encountered within\n");
|
||
|
|
+ printf(" \tsubdirectories encountered within (note the ':' at\n");
|
||
|
|
+ printf(" \tthe end of the option, manpage for more details)\n");
|
||
|
|
printf(" -s --symlinks \tfollow symlinks\n");
|
||
|
|
printf(" -H --hardlinks \tnormally, when two or more files point to the same\n");
|
||
|
|
printf(" \tdisk area they are treated as non-duplicates; this\n");
|
||
|
|
--
|
||
|
|
1.7.11.5
|
||
|
|
|