diff options
| -rw-r--r-- | src/client.c | 3 | ||||
| -rw-r--r-- | src/satr.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/client.c b/src/client.c index 9df327e..c4f2987 100644 --- a/src/client.c +++ b/src/client.c @@ -59,7 +59,7 @@ send_command(enum command cmd, size_t n, const char *restrict msg) size_t measure_array(char *array[]) { - size_t rc = 1; + size_t rc = 0; for (; *array; array++) rc += strlen(*array) + 1; return rc * sizeof(char); @@ -80,7 +80,6 @@ store_array(char *restrict storage, char *array[]) storage = stpcpy(storage, *array); *storage++ = 0; } - *storage++ = 0; return storage; } @@ -63,16 +63,18 @@ main(int argc, char *argv[]) char *msg = NULL; int i; - if (argc > 0) argv0 = argv[0]; + if (argc > 0) + argv0 = argv[0]; if (argc < 2) goto run; - if (!strcmp(argv[1], "--") + if (!strcmp(argv[1], "--")) argv++, argc--; for (i = 1; i < argc; i++) if (argv[i][0] == '-') usage(); - if (!(msg = malloc(n = measure_array(argv + 1)))) + n = measure_array(argv + 1); + if (n ? !(msg = malloc(n)) : 0) goto fail; store_array(msg, argv + 1); |