Attachment 148898 Details for Bug 229434 – Correct file map lexer to accept blank lines with only white space

[patch] Correct file map lexer to accept blank lines with only white space

autofs-5.0.1-multi-map-white-space-parse.patch (text/plain), 1.60 KB, created by Ian Kent on 2007-02-28 07:15:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Kent

Created: 2007-02-28 07:15:54 UTC

Size: 1.60 KB

patch

obsolete

>diff --git a/modules/lookup_file.c b/modules/lookup_file.c
>index 0f4d8f1..4a5674e 100644
>--- a/modules/lookup_file.c
>+++ b/modules/lookup_file.c
>@@ -236,11 +236,21 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig
> 
> 		case st_badent:
> 			if (ch == '\n') {
>+				nch = getc(f);
>+				if (nch != EOF && isblank(nch)) {
>+					ungetc(nch, f);
>+					break;
>+				}
>+				ungetc(nch, f);
> 				state = st_begin;
> 				if (gotten == got_real || gotten == getting)
> 					goto got_it;
>+				warn(LOGOPT_ANY, MODPREFIX 
>+				      "bad map entry \"%s...\" for key "
>+				      "\"%s\"", mapent, key);
> 				goto next;
>-			}
>+			} else if (!isblank(ch))
>+				gotten = got_nothing;
> 			break;
> 
> 		case st_entspc:
>@@ -274,24 +284,21 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig
> 
> 		case st_getent:
> 			if (ch == '\n') {
>+				if (escape == esc_all) {
>+					state = st_begin;
>+					warn(LOGOPT_ANY, MODPREFIX
>+					     "unmatched \" in %s for key %s",
>+					     mapent, key);
>+					goto next;
>+				}
> 				nch = getc(f);
> 				if (nch != EOF && isblank(nch)) {
> 					ungetc(nch, f);
> 					state = st_badent;
>-					gotten = got_nothing;
>-					warn(LOGOPT_ANY, MODPREFIX 
>-					      "bad map entry \"%s...\" for key "
>-					      "\"%s\"", mapent, key);
> 					break;
> 				}
> 				ungetc(nch, f);
> 				state = st_begin;
>-				if (escape == esc_all) {
>-					warn(LOGOPT_ANY, MODPREFIX
>-					     "unmatched \" in %s for key %s",
>-					     mapent, key);
>-					goto next;
>-				}
> 				if (gotten == got_real || gotten == getting)
> 					goto got_it;
> 			} else if (mapent_len < MAPENT_MAX_LEN) {

Actions: View | Diff

Attachments on bug 229434: 148550 | 148552 | 148727 | 148728 | 148729 | 148898