[pacman-dev] [PATCH v4 1/2] pacman-conf.c: add short options
From: Ivy Foster <iff@escondida.tk> --- src/pacman/pacman-conf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 1e6f55f9..ab73d896 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -42,13 +42,13 @@ static void usage(int ret) hputs("usage: pacman-conf [options] [<directive>...]"); hputs(" pacman-conf (--repo-list|--help|--version)"); hputs("options:"); - hputs(" --config=<path> set an alternate configuration file"); - hputs(" --rootdir=<path> set an alternate installation root"); - hputs(" --repo=<remote> query options for a specific repo"); - hputs(" --verbose always show directive names"); - hputs(" --repo-list list configured repositories"); - hputs(" --help display this help information"); - hputs(" --version display version information"); + hputs(" -c, --config=<path> set an alternate configuration file"); + hputs(" -R, --rootdir=<path> set an alternate installation root"); + hputs(" -r, --repo=<remote> query options for a specific repo"); + hputs(" -v, --verbose always show directive names"); + hputs(" -l, --repo-list list configured repositories"); + hputs(" -h, --help display this help information"); + hputs(" -V, --version display version information"); #undef hputs cleanup(); exit(ret); @@ -59,7 +59,7 @@ static void parse_opts(int argc, char **argv) int c; config_file = CONFFILE; - const char *short_opts = ""; + const char *short_opts = "c:hlR:r:Vv"; struct option long_opts[] = { { "config" , required_argument , NULL , 'c' }, { "rootdir" , required_argument , NULL , 'R' }, -- 2.16.1
From: Ivy Foster <iff@escondida.tk> --- src/pacman/pacman-conf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index ab73d896..4ffa24a3 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -400,7 +400,10 @@ int main(int argc, char **argv) { int ret = 0; - config = config_new(); + if(!(config = config_new())) { + /* config_new prints the appropriate error message */ + return 1; + } parse_opts(argc, argv); if(!config) { ret = 1; -- 2.16.1
On 02/15/18 at 04:20pm, iff@escondida.tk wrote:
From: Ivy Foster <iff@escondida.tk>
--- src/pacman/pacman-conf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index ab73d896..4ffa24a3 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -400,7 +400,10 @@ int main(int argc, char **argv) { int ret = 0;
- config = config_new(); + if(!(config = config_new())) { + /* config_new prints the appropriate error message */ + return 1; + } parse_opts(argc, argv); if(!config) { ret = 1;
ACK.
On 16/02/18 08:20, iff@escondida.tk wrote:
From: Ivy Foster <iff@escondida.tk>
--- src/pacman/pacman-conf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
Thanks, A
participants (3)
-
Allan McRae
-
Andrew Gregory
-
iff@escondida.tk