Attachment 296994 Details for Bug 435960 – And another correction

[patch] And another correction

autofs-5.0.2-map-type-in-map-name.patch (text/plain), 997 bytes, created by Ian Kent on 2008-03-06 04:12:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Kent

Created: 2008-03-06 04:12:34 UTC

Size: 997 bytes

patch

obsolete

>diff -up autofs-5.0.1/lib/master_tok.l.map-type-in-map-name autofs-5.0.1/lib/master_tok.l
>--- autofs-5.0.1/lib/master_tok.l.map-type-in-map-name	2008-03-06 13:00:32.000000000 +0900
>+++ autofs-5.0.1/lib/master_tok.l	2008-03-06 13:03:49.000000000 +0900
>@@ -79,6 +79,7 @@ int my_yyinput(char *, int);
> char buff[1024];
> char *bptr;
> char *optr = buff;
>+char *tptr;
> 
> %}
> 
>@@ -191,17 +192,25 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--
> <MAPSTR>{
> 	{OPTWS}\\\n{OPTWS} {}
> 
>-	{MULTI} {
>-		strcpy(master_lval.strtype, master_text);
>+	{WS}{MULTI} {
>+		tptr = master_text;
>+		while (*tptr && isblank(*tptr)) {
>+			tptr++;
>+		}
>+		strcpy(master_lval.strtype, tptr);
> 		return(MULTITYPE);
> 	}
> 
>-	{MTYPE} {
>-		strcpy(master_lval.strtype, master_text);
>+	{WS}{MTYPE} {
>+		tptr = master_text;
>+		while (*tptr && isblank(*tptr)) {
>+			tptr++;
>+		}
>+		strcpy(master_lval.strtype, tptr);
> 		return(MAPTYPE);
> 	}
> 
>-	{MULTISEP} { return(DDASH); }
>+	{WS}{MULTISEP} { return(DDASH); }
> 
> 	":"	{ return(COLON); }
>

Actions: View | Diff

Attachments on bug 435960: 296991 | 296992 | 296994 | 299606