empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(xuflds): The way field separators were parsed lead to confusing

Browse source 
diagnostics on EOF.  Fix.  Also simplify treatment of newline.

(xuflds): Require identifiers to start with a letter.
This commit is contained in:
Markus Armbruster 2005-12-02 18:57:55 +00:00
parent 1e4ecda185
commit b2e18c5125
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/lib/common/xundump.c
View file

@ -110,7 +110,6 @@ static int
xuflds(FILE *fp, struct value values[]) xuflds(FILE *fp, struct value values[])
{ {
int i, ch; int i, ch;
char sep;
char buf[1024]; char buf[1024];
for (i = 0; ; i++) { for (i = 0; ; i++) {
@ -119,20 +118,21 @@ xuflds(FILE *fp, struct value values[])
return gripe("Too many columns"); return gripe("Too many columns");
ch = getc(fp); ch = getc(fp);
ungetc(ch, fp);
switch (ch) { switch (ch) {
case EOF: case EOF:
return gripe("Unexpected EOF"); return gripe("Unexpected EOF");
case '\n':
return i;
case '+': case '-': case '.': case '+': case '-': case '.':
case '0': case '1': case '2': case '3': case '4': case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': case '5': case '6': case '7': case '8': case '9':
if (fscanf(fp, "%lg%c", &values[i].v_field.v_double, &sep) != 2) ungetc(ch, fp);
if (fscanf(fp, "%lg", &values[i].v_field.v_double) != 1)
return gripe("Malformed number in field %d", i + 1); return gripe("Malformed number in field %d", i + 1);
values[i].v_type = VAL_DOUBLE; values[i].v_type = VAL_DOUBLE;
break; break;
case '"': case '"':
if (fscanf(fp, "\"%1023[^ \n]%c", buf, &sep) != 2 if (fscanf(fp, "%1023[^ \n]", buf) != 1
|| buf[strlen(buf)-1] != '"') || buf[strlen(buf)-1] != '"')
return gripe("Malformed string in field %d", i + 1); return gripe("Malformed string in field %d", i + 1);
buf[strlen(buf)-1] = '\0'; buf[strlen(buf)-1] = '\0';
@ -143,7 +143,8 @@ xuflds(FILE *fp, struct value values[])
values[i].v_field.v_string = strdup(buf); values[i].v_field.v_string = strdup(buf);
break; break;
default: default:
if (fscanf(fp, "%1023[^ \n]%c", buf, &sep) != 2) { ungetc(ch, fp);
if (fscanf(fp, "%1023[^ \n]", buf) != 1 || !isalpha(buf[0])) {
return gripe("Junk in field %d", i + 1); return gripe("Junk in field %d", i + 1);
} }
if (!strcmp(buf, "nil")) { if (!strcmp(buf, "nil")) {
@ -155,15 +156,12 @@ xuflds(FILE *fp, struct value values[])
values[i].v_field.v_string = strdup(buf); values[i].v_field.v_string = strdup(buf);
} }
} }
if (sep == '\n') ch = getc(fp);
break; if (ch == '\n')
if (sep != ' ') ungetc(ch, fp);
return gripe( else if (ch != ' ')
"Expected space or newline as field separator found %c", return gripe("Bad field separator after field %d", i + 1);
sep);
} }
values[++i].v_type = VAL_NOTUSED;
return i;
} }
static void static void