Bugfix.

* src/cfg.c (ISWS, skipws): Remove macros.
(parse_config_loop): Rely on wordsplit to
detect empty lines.

1 files changed, 4 insertions, 9 deletions

diff --git a/src/cfg.c b/src/cfg.c
index a818f3f..b365a43 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -16,9 +16,6 @@
 
 #include "smapd.h"
 
-#define ISWS(c) (strchr(" \t\f\r",c))
-#define skipws(p) do { while (ISWS(*(p))) (p)++; } while (0)
-
 FILE *infile;
 const char *cfg_file_name;
 unsigned cfg_line;
@@ -190,20 +187,18 @@ parse_config_loop(struct cfg_kw *kwtab, void *data)
 	ws.ws_comment = "#";
 	
 	while (!eof && read_line(&buf, &size)) {
-		char *p = buf;
 		struct cfg_kw *kwp;
 		
-		skipws(p);
-		if (!*p || *p == '#')
-			continue;
-
-		if (wordsplit(p, &ws, wsflags)) {
+		if (wordsplit(buf, &ws, wsflags)) {
 			smap_error("%s:%u: cannot parse line",
 				   cfg_file_name, cfg_line);
 			exit(EX_SOFTWARE);
 		}
 		wsflags |= WRDSF_REUSE;
 
+		if (ws.ws_wordc == 0)
+			continue;
+		
 		kwp = find_cfg_kw(kwtab, ws.ws_wordv[0]);
 		if (!kwp) {
 			smap_error("%s:%u: unrecognized line",