File wildcard-zerowidth.diff of Package lilo

Overview Repositories Revisions Requests Users Attributes Meta

File wildcard-zerowidth.diff of Package lilo (Revision 14d86d1434a99855dbc5f914854c09a2)

Currently displaying revision 14d86d1434a99855dbc5f914854c09a2 , Show latest

Index: lilo-22.3.4/bsect.c
===================================================================
--- lilo-22.3.4.orig/bsect.c
+++ lilo-22.3.4/bsect.c
@@ -1351,10 +1351,11 @@ void do_image(void)
     
     if (cfg_get_strg(cf_image,"wildcard")) {
 	char *w, *image, *label, *initrd;
+	int wlen;
 	
-	w = wildcard(cfg_get_strg(cf_image,"wildcard"));
+	w = wildcard(cfg_get_strg(cf_image,"wildcard"), &wlen);
 	if (w)
-	    inplace_sort(w);
+	    inplace_sort(w, wlen);
 
 	image = cfg_get_strg(cf_top,"image");
 	if (image)
@@ -1370,7 +1371,7 @@ void do_image(void)
 	if (initrd)
 	    initrd = stralloc(initrd);
 
-	for (; w && *w; w += strlen(w) + 1) {
+	for (; w && wlen; wlen -= strlen(w) + 1, w += strlen(w) + 1) {
 	    int len;
 	    char *l;
 
Index: lilo-22.3.4/wildcard.c
===================================================================
--- lilo-22.3.4.orig/wildcard.c
+++ lilo-22.3.4/wildcard.c
@@ -45,11 +45,11 @@ wildcard_handler(char *name)
   p = name + strlen (name) - strlen (wildcard_suffix);
   /* [n .. p) is the part matching the asterisk */
 
-  if (p <= n || strcmp (p, wildcard_suffix) != 0)
-    return; /* zero-length match or suffix mismatch */
+  if (p < n || strcmp (p, wildcard_suffix) != 0)
+    return; /* suffix mismatch */
 
   /* store this match */
-  if (p - n + 2 > sizeof (wildcard_matches) -
+  if (p - n + 1 > sizeof (wildcard_matches) -
 		  (end_wildcard_matches - wildcard_matches))
     return; /* out of space */
   while (n < p)
@@ -60,7 +60,7 @@ wildcard_handler(char *name)
 /* Wildcard expand the GLOB argument. Return NULL upon failure, or
    a list of 0-terminated expansions, terminated by a zero-length string. */
 char *
-wildcard (char *glob)
+wildcard (char *glob, int *len)
 {
   char path[128], *p;
   int ret;
@@ -105,24 +105,24 @@ wildcard (char *glob)
   wildcard_prefix[strlen (wildcard_prefix)] = '*';
   if (!ret)
     return NULL;
-  *end_wildcard_matches++ = 0;
+  *len = end_wildcard_matches - wildcard_matches;
   return wildcard_matches;
 }
 
 #define skip(str) ((str) + strlen (str) + 1)
 
 void
-inplace_sort (char *str)
+inplace_sort (char *str, int len)
 {
   int m, n = 0;
-  char *s, *t, *x;
+  char *s, *t;
 
-  for (s = str; *s; s = skip (s))
-    n++;
-  
   /* we use x as temporary storage */
-  x = s + 1;
+  char *x = str + len;
 
+  for (s = str; s < x; s = skip (s))
+    n++;
+  
   for (; n >= 2; n--)
     {
       s = str;
@@ -147,6 +147,8 @@ inplace_sort (char *str)
     }
 }
 
+#undef skip
+
 /* Expand all asterisks (*) in a menu entry or commands section with its
    substitution. Use a backslash as escape character. */
 char *
Index: lilo-22.3.4/wildcard.h
===================================================================
--- lilo-22.3.4.orig/wildcard.h
+++ lilo-22.3.4/wildcard.h
@@ -1,4 +1,4 @@
 int dir (char *dirname, void (*handle)(char *));
-char *wildcard (char *glob);
-void inplace_sort (char *str);
+char *wildcard (char *glob, int *len);
+void inplace_sort (char *str, int len);
 char *expand_asterisks (const char *str, int *len, const char *subst);

Places

File wildcard-zerowidth.diff of Package lilo (Revision 14d86d1434a99855dbc5f914854c09a2)

Places