qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-09 22:27:28 +03:00
Code

swconfig: clean up command line parsing

Browse Source 
The command line parser was unsystematic and it silently ignored
many illegal combinations of options. Try to clean that up.

Signed-off-by: Martin Mares <mj@ucw.cz>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19639 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2010-02-15 17:28:56 +00:00
parent 29616c3532
commit 958c69f1aa
1 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
package/swconfig/src/cli.c
View File

@ -34,9 +34,11 @@
#include "swlib.h" #include "swlib.h"
enum { enum {
GET, CMD_NONE,
SET, CMD_GET,
LOAD CMD_SET,
CMD_LOAD,
CMD_HELP,
}; };
static void static void
@ -124,13 +126,12 @@ int main(int argc, char **argv)
struct switch_port *ports; struct switch_port *ports;
int cmd = 0; int cmd = CMD_NONE;
char *cdev = NULL; char *cdev = NULL;
int cport = -1; int cport = -1;
int cvlan = -1; int cvlan = -1;
char *ckey = NULL; char *ckey = NULL;
char *cvalue = NULL; char *cvalue = NULL;
int chelp = 0;
if(argc < 4) if(argc < 4)
print_usage(); print_usage();
@ -142,44 +143,36 @@ int main(int argc, char **argv)
for(i = 3; i < argc; i++) for(i = 3; i < argc; i++)
{ {
int p; char *arg = argv[i];
if (!strcmp(argv[i], "help")) { if (cmd != CMD_NONE) {
chelp = 1;
continue;
}
if( i + 1 >= argc)
print_usage(); print_usage();
p = atoi(argv[i + 1]); } else if (!strcmp(arg, "port") && i+1 < argc) {
if (!strcmp(argv[i], "port")) { cport = atoi(argv[++i]);
cport = p; } else if (!strcmp(arg, "vlan") && i+1 < argc) {
} else if (!strcmp(argv[i], "vlan")) { cvlan = atoi(argv[++i]);
cvlan = p; } else if (!strcmp(arg, "help")) {
} else if (!strcmp(argv[i], "set")) { cmd = CMD_HELP;
if(argc <= i + 1) } else if (!strcmp(arg, "set") && i+1 < argc) {
print_usage(); cmd = CMD_SET;
cmd = SET; ckey = argv[++i];
ckey = argv[i + 1]; if (i+1 < argc)
if (argc > i + 2) cvalue = argv[++i];
cvalue = argv[i + 2]; } else if (!strcmp(arg, "get") && i+1 < argc) {
else cmd = CMD_GET;
cvalue = NULL; ckey = argv[++i];
i++; } else if (!strcmp(arg, "load") && i+1 < argc) {
} else if (!strcmp(argv[i], "get")) {
cmd = GET;
ckey = argv[i + 1];
} else if (!strcmp(argv[i], "load")) {
if ((cport >= 0) || (cvlan >= 0)) if ((cport >= 0) || (cvlan >= 0))
print_usage(); print_usage();
cmd = CMD_LOAD;
ckey = argv[i + 1]; ckey = argv[++i];
cmd = LOAD;
} else { } else {
print_usage(); print_usage();
} }
i++;
} }
if(cport > -1 && cvlan > -1) if (cmd == CMD_NONE)
print_usage();
if (cport > -1 && cvlan > -1)
print_usage(); print_usage();
dev = swlib_connect(cdev); dev = swlib_connect(cdev);
@ -192,13 +185,7 @@ int main(int argc, char **argv)
memset(ports, 0, sizeof(struct switch_port) * dev->ports); memset(ports, 0, sizeof(struct switch_port) * dev->ports);
swlib_scan(dev); swlib_scan(dev);
if(chelp) if (cmd == CMD_GET || cmd == CMD_SET) {
{
list_attributes(dev);
goto out;
}
if (cmd != LOAD) {
if(cport > -1) if(cport > -1)
a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_PORT, ckey); a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_PORT, ckey);
else if(cvlan > -1) else if(cvlan > -1)
@ -215,7 +202,7 @@ int main(int argc, char **argv)
switch(cmd) switch(cmd)
{ {
case SET: case CMD_SET:
if ((a->type != SWITCH_TYPE_NOVAL) && if ((a->type != SWITCH_TYPE_NOVAL) &&
(cvalue == NULL)) (cvalue == NULL))
print_usage(); print_usage();
@ -230,7 +217,7 @@ int main(int argc, char **argv)
goto out; goto out;
} }
break; break;
case GET: case CMD_GET:
if(cvlan > -1) if(cvlan > -1)
val.port_vlan = cvlan; val.port_vlan = cvlan;
if(cport > -1) if(cport > -1)
@ -259,9 +246,12 @@ int main(int argc, char **argv)
break; break;
} }
break; break;
case LOAD: case CMD_LOAD:
swconfig_load_uci(dev, ckey); swconfig_load_uci(dev, ckey);
break; break;
case CMD_HELP:
list_attributes(dev);
break;
} }
out: out: