Commit 25d15d25 authored by Daniel Salzman's avatar Daniel Salzman

knsupdate: remove leading and trailing white space

parent 10c76d98
......@@ -469,18 +469,10 @@ static int pkt_sendrecv(knsupdate_params_t *params)
return rb;
}
static int process_line(char *lp, int len, void *arg)
static int process_line(char *lp, void *arg)
{
knsupdate_params_t *params = (knsupdate_params_t *)arg;
/* Remove trailing white space chars. */
for (int i = len - 1; i >= 0; i--) {
if (isspace((unsigned char)lp[i]) == 0) {
break;
}
lp[i] = '\0';
}
/* Check for empty line or comment. */
if (lp[0] == '\0' || lp[0] == ';') {
return KNOT_EOK;
......@@ -515,10 +507,13 @@ static int process_lines(knsupdate_params_t *params, FILE *fp)
}
/* Process lines. */
size_t len;
FILE *input = (fp != NULL) ? fp : stdin;
while (!params->stop && (len = knot_getline(&buf, &buflen, input)) != -1) {
int call_ret = process_line(buf, len, params);
while (!params->stop && knot_getline(&buf, &buflen, input) != -1) {
/* Remove leading and trailing white space. */
char *line = strstrip(buf);
int call_ret = process_line(line, params);
memset(line, 0, strlen(line));
free(line);
if (call_ret != KNOT_EOK) {
/* Return the first error. */
if (ret == KNOT_EOK) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment