ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libfdisk: fix script parser 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-10-07 15:33:18 +02:00
parent 50f7514e9d
commit d79634cfa8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libfdisk/src/script.c
View File

@ -626,7 +626,12 @@ static int parse_script_line(struct fdisk_script *dp, char *s)
}
} else if (!strncasecmp(p, "bootable", 8)) {
char *x;
p += 8;
x = next_separator(p);
if (x)
p = x + 1;
pa->boot = 1;
} else if (!strncasecmp(p, "attrs=", 6)) {
@ -672,10 +677,6 @@ static int parse_script_line(struct fdisk_script *dp, char *s)
rc = -EINVAL;
break;
}
while (isblank(*p)) p++;
if (*p == ',' || *p == ';')
p++;
}
if (!rc)
@ -757,6 +758,7 @@ static int parse_commas_line(struct fdisk_script *dp, char *s)
while (rc == 0 && p && *p) {
uint64_t num;
char *begin;
while (isblank(*p)) p++;
if (!*p)
@ -764,6 +766,7 @@ static int parse_commas_line(struct fdisk_script *dp, char *s)
item++;
DBG(SCRIPT, ul_debugobj(dp, " parsing item %d ('%s')", item, p));
begin = p;
switch (item) {
case ITEM_START:
@ -829,8 +832,7 @@ static int parse_commas_line(struct fdisk_script *dp, char *s)
break;
}
while (isblank(*p)) p++;
if (*p == ',' || *p == ';')
if (begin == p)
p++;
}