diff options
| author | rocky <rocky@gnu.org> | 2012-10-22 21:01:39 -0400 |
|---|---|---|
| committer | rocky <rocky@gnu.org> | 2012-10-22 21:01:39 -0400 |
| commit | cf6b347056e072fd6c53943a7672d8118d30c4a0 (patch) | |
| tree | 7cd8742d1248d02c117e745df39d3c9384477638 | |
| parent | 906462c731edee99910f4a67f7e75085a5e50ff4 (diff) | |
-U option-processing fixes.
| -rw-r--r-- | src/iso-info.c | 6 | ||||
| -rw-r--r-- | src/iso-read.c | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/iso-info.c b/src/iso-info.c index 64495523..58c47611 100644 --- a/src/iso-info.c +++ b/src/iso-info.c @@ -115,11 +115,11 @@ parse_options (int argc, char *argv[]) " --usage Display brief usage message\n"; static const char usageText[] = - "Usage: %s [-d|--debug INT] [-i|--input FILE] [-f] [-l|--iso9660]\n" + "Usage: %s [-i|--input FILE] [-f] [-l|--iso9660] [-U|--udf]\n" " [--no-header] [--no-joliet] [--no-rock-ridge] [--no-xa] [-q|--quiet]\n" - " [-V|--version] [-?|--help] [--usage]\n"; + " [-d|--debug INT] [-V|--version] [-?|--help] [--usage]\n"; - static const char optionsString[] = "d:i::flqV?"; + static const char optionsString[] = "d:i::flUqV?"; static const struct option optionsTable[] = { {"debug", required_argument, NULL, 'd'}, {"input", optional_argument, NULL, 'i'}, diff --git a/src/iso-read.c b/src/iso-read.c index 5290c509..68792226 100644 --- a/src/iso-read.c +++ b/src/iso-read.c @@ -93,11 +93,11 @@ parse_options (int argc, char *argv[]) static const char usageText[] = "Usage: %s [-d|--debug INT] [-i|--image FILE] [-e|--extract FILE]\n" - " [--no-header] [-o|--output-file FILE] [-V|--version] [-?|--help]\n" - " [--usage]\n"; + " [--no-header] [-o|--output-file FILE] [-U|--udf]\n" + " [-V|--version] [-?|--help] [--usage]\n"; /* Command-line options */ - static const char* optionsString = "d:i:e:o:Vk?"; + static const char* optionsString = "d:i:e:o:VUk?"; static const struct option optionsTable[] = { {"debug", required_argument, NULL, 'd' }, {"image", required_argument, NULL, 'i' }, @@ -105,7 +105,7 @@ parse_options (int argc, char *argv[]) {"no-header", no_argument, &opts.no_header, 1 }, {"ignore", no_argument, &opts.ignore, 'k' }, {"output-file", required_argument, NULL, 'o' }, - {"udf", no_argument, &opts.udf, 'U' }, + {"udf", no_argument, &opts.udf, 'U' }, {"version", no_argument, NULL, 'V' }, {"help", no_argument, NULL, '?' }, @@ -124,6 +124,7 @@ parse_options (int argc, char *argv[]) case 'k': opts.ignore = 1; break; case 'e': opts.file_name = strdup(optarg); break; case 'o': opts.output_file = strdup(optarg); break; + case 'U': opts.udf = 1; break; case 'V': print_version(program_name, CDIO_VERSION, 0, true); |