Convert cfg.c to use cmd-string stuff.

cfg.c

@@ -1,4 +1,4 @@
-/* $Id: cfg.c,v 1.9 2008-06-16 20:25:54 nicm Exp $ */
+/* $Id: cfg.c,v 1.10 2008-06-19 21:13:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -51,169 +51,73 @@ cfg_error(unused struct cmd_ctx *ctx, const char *fmt, ...)
 }
 
 int
-load_cfg(const char *path, char **causep)
+load_cfg(const char *path, char **cause)
 {
 	FILE   	       *f;
-	int		ch, argc;
+	u_int		n;
-	u_int		line;
+	char	       *buf, *line, *ptr;
-	char	      **argv, *buf, *s, *cause;
 	size_t		len;
 	struct cmd     *cmd;
 	struct cmd_ctx	ctx;
 
 	if ((f = fopen(path, "rb")) == NULL) {
-		xasprintf(causep, "%s: %s", path, strerror(errno));
+		xasprintf(cause, "%s: %s", path, strerror(errno));
 		return (1);
 	}
-	cause = NULL;
+	n = 0;
 
-	argv = NULL;
+	line = NULL;
-	argc = 0;
+	while ((buf = fgetln(f, &len))) {
+		if (buf[len - 1] == '\n')
+			buf[len - 1] = '\0';
+		else {
+			line = xrealloc(line, 1, len + 1);
+			memcpy(line, buf, len);
+			line[len] = '\0';
+			buf = line;
+		}
+		n++;
 
-	buf = NULL;
+		/* Trim spaces from start and end. */
-	len = 0;
+		while (*buf != '\0' && (*buf == ' ' || *buf == '\t'))
+			*buf++ = '\0';
+		len = strlen(buf);
+		while (len > 0 && (buf[len - 1] == ' ' || buf[len - 1] == '\t'))
+			buf[--len] = '\0';
+		if (*buf == '\0')
+			continue;
 
-	line = 0;
+		if ((cmd = cmd_string_parse(buf, cause)) == NULL)
-	while ((ch = getc(f)) != EOF) {
+			goto error;
-		switch (ch) {
+		cfg_cause = NULL;
-		case '\'':
-			if ((s = cfg_string(f, '\'', 0)) == NULL)
-				goto error;
-			argv = xrealloc(argv, argc + 1, sizeof *argv);
-			argv[argc++] = s;
-			break;
-		case '"':
-			if ((s = cfg_string(f, '"', 1)) == NULL)
-				goto error;
-			argv = xrealloc(argv, argc + 1, sizeof *argv);
-			argv[argc++] = s;
-			break;
-		case '#':
-			/* Comment: discard until EOL. */
-			while ((ch = getc(f)) != '\n' && ch != EOF)
-				;
-			/* FALLTHROUGH */
-		case '\n':
-		case EOF:
-		case ' ':
-		case '\t':
- 			if (len != 0) {
-				buf = xrealloc(buf, 1, len + 1);
-				buf[len] = '\0';
 
-				argv = xrealloc(argv, argc + 1, sizeof *argv);
+		ctx.msgdata = NULL;
-				argv[argc++] = buf;
+		ctx.cursession = NULL;
+		ctx.curclient = NULL;
 
-				buf = NULL;
+		ctx.error = cfg_error;
-				len = 0;
+		ctx.print = cfg_print;
-			}
+		ctx.info = cfg_print;
 
-			if (ch != '\n' && ch != EOF)
+		ctx.cmdclient = NULL;
-				break;
+		ctx.flags = 0;
-			line++;
-			if (argc == 0)
-				break;
 
-			if ((cmd = cmd_parse(argc, argv, &cause)) == NULL)
+		cfg_cause = NULL;
- 				goto error;
+		cmd_exec(cmd, &ctx);
-
+		cmd_free(cmd);
-			ctx.msgdata = NULL;
+		if (cfg_cause != NULL) {
-			ctx.cursession = NULL;
+			*cause = cfg_cause;
-			ctx.curclient = NULL;
+			goto error;
-
-			ctx.error = cfg_error;
-			ctx.print = cfg_print;
-			ctx.info = cfg_print;
-
-			ctx.cmdclient = NULL;
-			ctx.flags = 0;
-
-			cfg_cause = NULL;
-			cmd_exec(cmd, &ctx);
-			cmd_free(cmd);
-			if (cfg_cause != NULL) {
-				cause = cfg_cause;
-				goto error;
-			}
-
-			while (--argc >= 0)
-				xfree(argv[argc]);
-			argc = 0;
-			break;
-		default:
-			if (len >= SIZE_MAX - 2)
-				goto error;
-
-			buf = xrealloc(buf, 1, len + 1);
-			buf[len++] = ch;
-			break;
 		}
 	}
-
+	if (line != NULL)
-	fclose(f);
+		xfree(line);
 
 	return (0);
 
 error:
-	while (--argc >= 0)
+	xasprintf(&ptr, "%s: %s at line %u", path, *cause, n);
-		xfree(argv[argc]);
+	xfree(*cause);
-	xfree(argv);
+	*cause = ptr;
-
-	if (buf != NULL)
-		xfree(buf);
-
-	if (cause == NULL)
-		xasprintf(causep, "%s: error at line %u", path, line);
-	else
-		xasprintf(causep, "%s: %s at line %u", path, cause, line);
 	return (1);
 }
-
-char *
-cfg_string(FILE *f, char endch, int esc)
-{
-	int	ch;
-	char   *buf;
-	size_t	len;
-
-        buf = NULL;
-	len = 0;
-
-        while ((ch = getc(f)) != endch) {
-                switch (ch) {
-		case EOF:
-			goto error;
-                case '\\':
-			if (!esc)
-				break;
-                        switch (ch = getc(f)) {
-			case EOF:
-				goto error;
-                        case 'r':
-                                ch = '\r';
-                                break;
-                        case 'n':
-                                ch = '\n';
-                                break;
-                        case 't':
-                                ch = '\t';
-                                break;
-                        }
-                        break;
-                }
-
-		if (len >= SIZE_MAX - 2)
-			goto error;
-		buf = xrealloc(buf, 1, len + 1);
-                buf[len++] = ch;
-        }
-
-	buf = xrealloc(buf, 1, len + 1);
-	buf[len] = '\0';
-	return (buf);
-
-error:
-	if (buf != NULL)
-		xfree(buf);
-	return (NULL);
-}

cmd-string.c

@@ -1,4 +1,4 @@
-/* $Id: cmd-string.c,v 1.1 2008-06-19 20:45:20 nicm Exp $ */
+/* $Id: cmd-string.c,v 1.2 2008-06-19 21:13:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -93,7 +93,9 @@ cmd_string_parse(const char *s, char **cause)
 
 			if (ch != EOF)
 				break;
-
+			if (argc == 0)
+				goto error;
+				
 			cmd = cmd_parse(argc, argv, cause);
 			goto out;
 		default: