Attachment 221451 Details for Bug 305261 – Strip comments from the end of a line in a map entry.

[patch] Strip comments from the end of a line in a map entry.

autofs-4.1.3-remove-comments-from-end.patch (text/plain), 997 bytes, created by Jeff Moyer on 2007-10-09 16:21:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Moyer

Created: 2007-10-09 16:21:13 UTC

Size: 997 bytes

patch

obsolete

>--- autofs-4.1.3/modules/parse_sun.c.orig	2007-10-09 11:20:32.000000000 -0400
>+++ autofs-4.1.3/modules/parse_sun.c	2007-10-09 12:14:59.000000000 -0400
>@@ -782,7 +782,7 @@ int parse_mount(const char *root, const 
> 		int name_len, const char *mapent, void *context)
> {
> 	struct parse_context *ctxt = (struct parse_context *) context;
>-	char *pmapent, *options;
>+	char *pmapent, *options, *comment;
> 	const char *p, *q;
> 	int mapent_len, rv;
> 	int optlen;
>@@ -825,6 +825,20 @@ int parse_mount(const char *root, const 
> 
> 	debug(MODPREFIX "gathered options: %s", options);
> 
>+	/* the location portion of the string comes last.  If there is
>+	 * a comment at the end of the line, truncate the line */
>+	q = p;
>+	while (*q != '\0') {
>+		comment = strchr(q, '#');
>+		if (!comment)
>+			break;
>+		if (comment > q && *(comment - 1) != '\\') {
>+			*comment = '\0';
>+			break;
>+		} else
>+			q = comment+1;
>+	}
>+
> 	if (*p == '/') {
> 		struct multi_mnt *list, *head = NULL, *next;
> 		char *multi_root, *pstrip;

Actions: View | Diff

Attachments on bug 305261: 221451