andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cli: introduce "--" as option terminator

Browse Source 
This way it becomes possible to pass option-like arguments to
cli commands.

Change-Id: I8eb1a44ce5d1bfe901d2b3e7cc7bfb84bb3012c9
BUG: 815194
Signed-off-by: Csaba Henk <csaba@redhat.com>
Reviewed-on: http://review.gluster.org/4007
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
This commit is contained in:
Csaba Henk 2012-10-01 15:06:43 +02:00 committed by Anand Avati
parent dde806643b
commit 68433db9ba
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cli/src/cli.c
View File

@ -283,11 +283,20 @@ cli_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
return ret;
}
/*
* ret: 0: option successfully processed
* 1: signalling end of option list
* -1: unknown option or other issue
*/
int
cli_opt_parse (char *opt, struct cli_state *state)
{
char *oarg;
if (strcmp (opt, "") == 0)
return 1;
if (strcmp (opt, "version") == 0) {
puts (argp_program_version);
exit (0);
@ -360,6 +369,11 @@ parse_cmdline (int argc, char *argv[], struct cli_state *state)
state->argc--;
/* argv shifted, next check should be at i again */
i--;
if (ret == 1) {
/* end of cli options */
ret = 0;
break;
}
}
}