- for (i = 0; i < argc; ++i) {
- prop_res.vals[i].value = argv[i];
- prop_res.vals[i].length = strlen(argv[i]);
- }
- if (!has_id) {
- prop_res.vals[i].value = "-sm-client-id";
- prop_res.vals[i++].length = strlen("-sm-client-id");
- prop_res.vals[i].value = ob_sm_id;
- prop_res.vals[i++].length = strlen(ob_sm_id);
+ for (i = 0, j = 0; i < argc; ++i, ++j) {
+ if (strcmp (argv[i], "-sm-client-id") == 0) {
+ ++i, --j; /* skip the next as well, keep j where it is */
+ } else {
+ prop_res.vals[j].value = argv[i];
+ prop_res.vals[j].length = strlen(argv[i]);
+ }