Attachment 167756 Details for Bug 176449 – Patch cddl/compat/opensolaris/misc/fsshare.c for saner options parsing

[patch] Patch cddl/compat/opensolaris/misc/fsshare.c for saner options parsing

patch.txt (text/plain), 1002 bytes, created by Martin Birgmeier on 2016-03-06 07:20:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Birgmeier

Created: 2016-03-06 07:20:59 UTC

Size: 1002 bytes

patch

obsolete

>--- ./cddl/compat/opensolaris/misc/fsshare.c.ORIG	2011-06-18 12:32:55.499022925 +0200
>+++ ./cddl/compat/opensolaris/misc/fsshare.c	2016-02-28 09:01:18.973606149 +0100
>@@ -129,16 +130,18 @@
> 	strlcpy(oldopts, shareopts, sizeof(oldopts));
> 	newopts[0] = '\0';
> 	s = oldopts;
>-	while ((o = strsep(&s, "-, ")) != NULL) {
>+	while ((o = strsep(&s, ", ")) != NULL) {
> 		if (o[0] == '\0')
> 			continue;
>-		for (i = 0; known_opts[i] != NULL; i++) {
>-			len = strlen(known_opts[i]);
>-			if (strncmp(known_opts[i], o, len) == 0 &&
>-			    (o[len] == '\0' || o[len] == '=')) {
>-				strlcat(newopts, "-", sizeof(newopts));
>-				break;
>-			}
>+		if (o[0] != '-') {
>+		    for (i = 0; known_opts[i] != NULL; i++) {
>+			    len = strlen(known_opts[i]);
>+			    if (strncmp(known_opts[i], o, len) == 0 &&
>+				(o[len] == '\0' || o[len] == '=')) {
>+				    strlcat(newopts, "-", sizeof(newopts));
>+				    break;
>+			    }
>+		    }
> 		}
> 		strlcat(newopts, o, sizeof(newopts));
> 		strlcat(newopts, " ", sizeof(newopts));

Actions: View | Diff

Attachments on bug 176449: 167756