File autofsstrip.patch of Package autofs

Overview Repositories Revisions Requests Users Attributes Meta

File autofsstrip.patch of Package autofs (Revision d63a1adaa5ffbe65f67949d07a4cdf93)

Currently displaying revision d63a1adaa5ffbe65f67949d07a4cdf93 , Show latest

--- autofs-4.1.4/modules/parse_sun.c
+++ autofs-4.1.4/modules/parse_sun.c
@@ -233,13 +233,18 @@
 	return len;
 }
 
+
 /*
- * Skip whitespace in a string; if we hit a #, consider the rest of the
- * entry a comment.
+ * Strip whitespace around a string; 
+ * if we hit a #, consider the rest of the entry a comment.
  */
-const char *skipspace(const char *whence)
+const char *stripspace(const char *whence)
 {
-	while (1) {
+	int go = 1;
+	char *ptr;
+
+	/* Remove leading spaces */
+	while (go) {
 		switch (*whence) {
 		case ' ':
 		case '\b':
@@ -256,9 +261,36 @@
 			/* FALLTHROUGH */
 
 		default:
-			return whence;
+			go = 0;
+			break;
 		}
 	}
+	/* Remove trailing spaces */
+        ptr = strchr((char *)whence, '#');
+	if (! ptr) {
+                ptr = (char *)whence + strlen(whence) - 1;
+        }
+        else {
+		*ptr = '\0';
+                ptr--;
+        }
+	go = 1;
+        while ( go && ptr >= whence) {
+		switch (*ptr) {
+		case ' ':
+		case '\b':
+		case '\t':
+		case '\n':
+		case '\v':
+		case '\f':
+		case '\r':
+			*ptr-- = '\0';
+		default:
+			go = 0;
+			break;
+		}
+        }
+        return whence;
 }
 
 /*
@@ -769,7 +801,7 @@
 	int first_chunk = 0;
 
 	while (*p) {
-		p = skipspace(p);
+		p = stripspace(p);
 
 		/*
 		 * After the first chunk there can be additional
@@ -788,7 +820,7 @@
 
 		while (*p == '-') {
 			p += chunklen(p, 0);
-			p = skipspace(p);
+			p = stripspace(p);
 		}
 
 		/*
@@ -835,7 +867,7 @@
 	}
 	optlen = strlen(options);
 
-	p = skipspace(pmapent);
+	p = stripspace(pmapent);
 
 	/* Deal with 0 or more options */
 	if (*p == '-') {
@@ -849,7 +881,7 @@
 				error(MODPREFIX "concat_options: %m");
 				return 1;
 			}
-			p = skipspace(p);
+			p = stripspace(p);
 		} while (*p == '-');
 	}
 
@@ -893,7 +925,7 @@
 			}
 
 			p += l;
-			p = skipspace(p);
+			p = stripspace(p);
 
 			/* Local options are appended to per-map options */
 			if (*p == '-') {
@@ -911,7 +943,7 @@
 						multi_free_list(head);
 						return 1;
 					}
-					p = skipspace(p);
+					p = stripspace(p);
 				} while (*p == '-');
 			}
 
@@ -930,7 +962,7 @@
 			}
 
 			p += l;
-			p = skipspace(p);
+			p = stripspace(p);
 
 			while (*p && *p != '/') {
 				char *ent;
@@ -962,7 +994,7 @@
 				free(ent);
 
 				p += l;
-				p = skipspace(p);
+				p = stripspace(p);
 			}
 
 			list = head;
@@ -1020,7 +1052,7 @@
 		}
 
 		p += l;
-		p = skipspace(p);
+		p = stripspace(p);
 
 		while (*p) {
 			char *ent;
@@ -1046,7 +1078,7 @@
 			free(ent);
 
 			p += l;
-			p = skipspace(p);
+			p = stripspace(p);
 		}
 
 		loclen = strlen(loc);

Places

File autofsstrip.patch of Package autofs (Revision d63a1adaa5ffbe65f67949d07a4cdf93)

Places