mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fish, format, fuse: Remove bogus short options.

Browse Source 
For guestfish, guestmount, remove '?' from short options.  Currently
those tools don't process -?, so I believe these are erroneous:

  $ guestfish -\?
  Try `guestfish --help' for more information.

For virt-format, the -c, -d and -q options are removed.  These options
just give errors because they appear in the short options list but not
in the case statement.
This commit is contained in:
Richard W.M. Jones
2016-07-18 17:26:41 +01:00
parent d03e8f461e
commit 8886f2951d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fish/fish.c
View File

@@ -182,7 +182,7 @@ main (int argc, char *argv[])
enum { HELP_OPTION = CHAR_MAX + 1 }; enum { HELP_OPTION = CHAR_MAX + 1 };
static const char *options = "a:c:d:Df:h::im:nN:rv?Vwx"; static const char *options = "a:c:d:Df:h::im:nN:rvVwx";
static const struct option long_options[] = { static const struct option long_options[] = {
{ "add", 1, 0, 'a' }, { "add", 1, 0, 'a' },
{ "cmd-help", 2, 0, 'h' }, { "cmd-help", 2, 0, 'h' },

2
format/format.c
View File

@@ -104,7 +104,7 @@ main (int argc, char *argv[])
enum { HELP_OPTION = CHAR_MAX + 1 }; enum { HELP_OPTION = CHAR_MAX + 1 };
static const char *options = "a:c:d:qvVx"; static const char *options = "a:vVx";
static const struct option long_options[] = { static const struct option long_options[] = {
{ "add", 1, 0, 'a' }, { "add", 1, 0, 'a' },
{ "filesystem", 1, 0, 0 }, { "filesystem", 1, 0, 0 },

2
fuse/guestmount.c
View File

@@ -149,7 +149,7 @@ main (int argc, char *argv[])
/* The command line arguments are broadly compatible with (a subset /* The command line arguments are broadly compatible with (a subset
* of) guestfish. Thus we have to deal mainly with -a, -m and --ro. * of) guestfish. Thus we have to deal mainly with -a, -m and --ro.
*/ */
static const char *options = "a:c:d:im:no:rv?Vwx"; static const char *options = "a:c:d:im:no:rvVwx";
static const struct option long_options[] = { static const struct option long_options[] = {
{ "add", 1, 0, 'a' }, { "add", 1, 0, 'a' },
{ "connect", 1, 0, 'c' }, { "connect", 1, 0, 'c' },

2
fuse/guestunmount.c
View File

@@ -76,7 +76,7 @@ main (int argc, char *argv[])
{ {
enum { HELP_OPTION = CHAR_MAX + 1 }; enum { HELP_OPTION = CHAR_MAX + 1 };
static const char *options = "qv?V"; static const char *options = "qvV";
static const struct option long_options[] = { static const struct option long_options[] = {
{ "fd", 1, 0, 0 }, { "fd", 1, 0, 0 },
{ "help", 0, 0, HELP_OPTION }, { "help", 0, 0, HELP_OPTION },