|
0 |
Description: fix getopt use in tools
|
|
1 |
Removed the home-made special-casing for `--help`. It's
|
|
2 |
not needed and wasn't interacting right with `getopt`.
|
|
3 |
Author: Jonas Jensen <jbj@knef.dk>
|
|
4 |
Bug-Debian: http://bugs.debian.org/716387
|
|
5 |
Last-Update: 2018-12-02
|
|
6 |
Index: magicrescue/tools/safecat.c
|
|
7 |
===================================================================
|
|
8 |
--- magicrescue.orig/tools/safecat.c
|
|
9 |
+++ magicrescue/tools/safecat.c
|
|
10 |
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
|
|
11 |
}
|
|
12 |
}
|
|
13 |
|
|
14 |
- if (argc - optind != 1 || strcmp(argv[optind], "--help") == 0) {
|
|
15 |
+ if (argc - optind != 1) {
|
|
16 |
usage();
|
|
17 |
return 1;
|
|
18 |
}
|
|
19 |
Index: magicrescue/tools/textextract.c
|
|
20 |
===================================================================
|
|
21 |
--- magicrescue.orig/tools/textextract.c
|
|
22 |
+++ magicrescue/tools/textextract.c
|
|
23 |
@@ -317,11 +317,6 @@ int main(int argc, char **argv)
|
|
24 |
|
|
25 |
int c, outfd;
|
|
26 |
|
|
27 |
- if (argc < 2 || strcmp(argv[1], "--help") == 0) {
|
|
28 |
- usage();
|
|
29 |
- return 1;
|
|
30 |
- }
|
|
31 |
-
|
|
32 |
while ((c = getopt(argc, argv, "M:s:b:l:r:")) >= 0) {
|
|
33 |
switch (c) {
|
|
34 |
case 'M':
|
|
35 |
@@ -351,6 +346,11 @@ int main(int argc, char **argv)
|
|
36 |
}
|
|
37 |
}
|
|
38 |
|
|
39 |
+ if (argc - optind != 1) {
|
|
40 |
+ usage();
|
|
41 |
+ return 1;
|
|
42 |
+ }
|
|
43 |
+
|
|
44 |
if (strcmp(argv[optind], "-") == 0) {
|
|
45 |
outfd = 1;
|
|
46 |
} else if ((outfd =
|