X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fshell%2Fconfig.c;h=a4ac005a40300cbe54a627eb5da1ae808ee41590;hb=6e052a5a07718b9f0ff417b27adf8b8ed8903f36;hp=4a0910d1e725c9d4a95db55ba3ea66fdd80a701e;hpb=29306b8ef49d9bcc61a288a6b3322a0983a99505;p=libucw.git

diff --git a/lib/shell/config.c b/lib/shell/config.c
index 4a0910d1..a4ac005a 100644
--- a/lib/shell/config.c
+++ b/lib/shell/config.c
@@ -47,7 +47,7 @@ Usage: config [-C<configfile>] [-S<section>.<option>=<value>] <sections>\n\
 <value>\t\t[a-zA-Z0-9.-/]* | 'string without single quotes'<value> | \"c-like string\"<value>\n\
 \n\
 Types:\n\
-:\t\tString\n\
+<empty>\t\tString\n\
 #\t\t32-bit integer\n\
 ##\t\t64-bit integer\n\
 $\t\tFloating point number\n\
@@ -158,10 +158,10 @@ parse_section(struct section *section)
 	    }
 	  item->cf.cls = CC_STATIC;
 	  item->cf.number = 1;
-	  switch (*pos++)
+	  switch (*pos)
 	    {
 	      case '#':
-		if (*pos == '#')
+		if (*++pos == '#')
 		  {
 		    pos++;
 		    item->cf.type = CT_U64;
@@ -170,13 +170,14 @@ parse_section(struct section *section)
 		  item->cf.type = CT_INT;
 		break;
 	      case '$':
+		pos++;
 		item->cf.type = CT_DOUBLE;
 		break;
-	      case ':':
+	      default:
+		if (!Cword(*pos))
+		  die("Invalid type syntax");
 		item->cf.type = CT_STRING;
 		break;
-	      default:
-		die("Invalid type syntax");
 	    }
 	  parse_white();
 	  item->cf.name = parse_name();