SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "udev-rules.c: remove 'first_token' variable"

Browse Source 
That was a mistake. The variable is needed to be set before
we parse the file. Thanks a lot to Alan Jenkins for spotting
this.

This reverts commit 710fdac1e4.
This commit is contained in:
Kay Sievers
2009-09-07 12:13:49 +02:00
parent f61e72d897
commit 77f89e9330
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
udev/udev-rules.c
+6 -2
View File
@@ -1568,6 +1568,7 @@ invalid:
static int parse_file(struct udev_rules *rules, const char *filename, unsigned short filename_off)
{
FILE *f;
unsigned int first_token;
char line[UTIL_LINE_SIZE];
int line_nr = 0;
unsigned int i;
@@ -1577,7 +1578,10 @@ static int parse_file(struct udev_rules *rules, const char *filename, unsigned s
f = fopen(filename, "r");
if (f == NULL)
return -1;
while (fgets(line, sizeof(line), f) != NULL) {
first_token = rules->token_cur;
while(fgets(line, sizeof(line), f) != NULL) {
char *key;
size_t len;
@@ -1614,7 +1618,7 @@ static int parse_file(struct udev_rules *rules, const char *filename, unsigned s
fclose(f);
/* link GOTOs to LABEL rules in this file to be able to fast-forward */
for (i = rules->token_cur+1; i < rules->token_cur; i++) {
for (i = first_token+1; i < rules->token_cur; i++) {
if (rules->tokens[i].type == TK_A_GOTO) {
char *label = &rules->buf[rules->tokens[i].key.value_off];
unsigned int j;