}
if (!ti) {
ti = malloc(sizeof(struct uci_type_list));
+ if (!ti)
+ return NULL;
memset(ti, 0, sizeof(struct uci_type_list));
ti->next = type_list;
type_list = ti;
} else {
typestr = realloc(typestr, maxlen);
}
- sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
+ if (typestr)
+ sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
ti->idx++;
+
return typestr;
}
ret = uci_add_list(ctx, &ptr);
break;
case CMD_REORDER:
- if (!ptr.s) {
+ if (!ptr.s || !ptr.value) {
ctx->err = UCI_ERR_NOTFOUND;
cli_perror();
return 1;
delimiter = optarg;
break;
case 'f':
+ if (input != stdin) {
+ perror("uci");
+ return 1;
+ }
+
input = fopen(optarg, "r");
if (!input) {
perror("uci");
ret = uci_cmd(argc - 1, argv + 1);
if (input != stdin)
fclose(input);
- if (ret == 255) {
+
+ if (ret == 255)
uci_usage();
- return 0;
- }
uci_free_context(ctx);