*/
#include "cli.h"
-#include "common.h"
-
-#include <string.h>
+#include "command.h"
#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
#include "config.h"
-#include "command.h"
-#include "xmalloc.h"
#include "debug.h"
#include "env.h"
#include "cli_readline.h"
outp = output;
} else {
int outputlen = outp - output;
- outp = xrealloc(output, outputlen);
+ outp = realloc(output, outputlen);
+ if (outp == NULL) {
+ free(output);
+ output = outp;
+ break;
+ }
output = outp;
}
/* find macros in this token and replace them */
finaltoken = process_macros(token, finaltoken);
+ if (finaltoken == NULL) {
+ rc = -1; /* no command at all */
+ break;
+ }
/* Extract arguments */
argc = cli_parse_line(finaltoken, argv);