From b816b860886d8f823627b89ce3fabc51148f2e68 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Tue, 9 Feb 2010 23:42:38 -0500 Subject: [PATCH] lbximg: Clean up option list. Despite it being very useful, --nopalette did not have a single character option. While we're at it, use --no-palette for consistency with GNU tools. --- src/lbximg.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/lbximg.c b/src/lbximg.c index c4075b0..6bdbaae 100644 --- a/src/lbximg.c +++ b/src/lbximg.c @@ -375,20 +375,20 @@ int main(int argc, char **argv) const char *file = NULL; LBX_IMG *img; - static const char *sopts = "idvf:p:O:V"; + static const char *sopts = "idnvf:p:O:V"; static const struct option lopts[] = { - { "ident", 0, NULL, 'i' }, - { "decode", 0, NULL, 'd' }, - { "verbose", 0, NULL, 'v' }, - { "file", 1, NULL, 'f' }, - { "palette", 1, NULL, 'p' }, - { "override", 1, NULL, 'p' }, + { "ident", 0, NULL, 'i' }, + { "decode", 0, NULL, 'd' }, + { "verbose", 0, NULL, 'v' }, + { "file", 1, NULL, 'f' }, + { "palette", 1, NULL, 'p' }, + { "override", 1, NULL, 'p' }, - { "version", 0, NULL, 'V' }, - { "usage", 0, NULL, 'U' }, - { "help", 0, NULL, 'H' }, + { "version", 0, NULL, 'V' }, + { "usage", 0, NULL, 'U' }, + { "help", 0, NULL, 'H' }, - { "nopalette", 0, &usepalette, 0 }, + { "no-palette", 0, NULL, 'n' }, { 0 } }; @@ -408,6 +408,9 @@ int main(int argc, char **argv) case 'f': file = optarg; break; + case 'n': + usepalette = 0; + break; case 'p': palf = fopen(optarg, "rb"); if (!palf) { -- 2.43.0