--- trunk/grubby/grubby.c	2012/02/18 01:06:48	1747
+++ trunk/grubby/grubby.c	2012/07/02 13:08:29	1849
@@ -114,6 +114,7 @@
 
 #define MAIN_DEFAULT	    (1 << 0)
 #define DEFAULT_SAVED       -2
+#define DEFAULT_SAVED_GRUB2 -3
 
 struct keywordTypes {
     char * key;
@@ -242,10 +243,9 @@
 }
 
 int sizeOfSingleLine(struct singleLine * line) {
-  int i;
   int count = 0;
 
-  for (i = 0; i < line->numElements; i++) {
+  for (int i = 0; i < line->numElements; i++) {
     int indentSize = 0;
 
     count = count + strlen(line->elements[i].item);
@@ -264,6 +264,13 @@
   return count;
 }
 
+static int isquote(char q)
+{
+    if (q == '\'' || q == '\"')
+	return 1;
+    return 0;
+}
+
 char *grub2ExtractTitle(struct singleLine * line) {
     char * current;
     char * current_indent;
@@ -280,55 +287,50 @@
     current_len = strlen(current);
 
     /* if second word is quoted, strip the quotes and return single word */
-    if ((*current == '\'') && (*(current + current_len - 1) == '\'')) {
-      char *tmp;
-
-      tmp = strdup(current);
-      *(tmp + current_len - 1) = '\0';
-      return ++tmp;
+    if (isquote(*current) && isquote(current[current_len - 1])) {
+	char *tmp;
+	
+	tmp = strdup(current);
+	*(tmp + current_len - 1) = '\0';
+	return ++tmp;
     }
 
     /* if no quotes, return second word verbatim */
-    if (*current != '\'') {
-      return current;
-    }
+    if (!isquote(*current))
+	return current;
 
     /* second element start with a quote, so we have to find the element
      * whose last character is also quote (assuming it's the closing one) */
-    if (*current == '\'') {
-      int resultMaxSize;
-      char * result;
-
-      resultMaxSize = sizeOfSingleLine(line);
-      result = malloc(resultMaxSize);
-      snprintf(result, resultMaxSize, "%s", ++current);
-
-      i++;
-      for (; i < line->numElements; ++i) {
+    int resultMaxSize;
+    char * result;
+    
+    resultMaxSize = sizeOfSingleLine(line);
+    result = malloc(resultMaxSize);
+    snprintf(result, resultMaxSize, "%s", ++current);
+    
+    i++;
+    for (; i < line->numElements; ++i) {
 	current = line->elements[i].item;
 	current_len = strlen(current);
 	current_indent = line->elements[i].indent;
 	current_indent_len = strlen(current_indent);
 
 	strncat(result, current_indent, current_indent_len);
-	if (*(current + current_len - 1) != '\'') {
-	  strncat(result, current, current_len);
+	if (!isquote(current[current_len-1])) {
+	    strncat(result, current, current_len);
 	} else {
-	  strncat(result, current, current_len - 1);
-	  break;
+	    strncat(result, current, current_len - 1);
+	    break;
 	}
-      }
-      return result;
     }
-
-    return NULL;
+    return result;
 }
 
 struct configFileInfo grub2ConfigType = {
     .findConfig = grub2FindConfig,
     .keywords = grub2Keywords,
     .defaultIsIndex = 1,
-    .defaultSupportSaved = 0,
+    .defaultSupportSaved = 1,
     .defaultIsVariable = 1,
     .entryStart = LT_MENUENTRY,
     .entryEnd = LT_ENTRY_END,
@@ -570,8 +572,7 @@
 
 static struct keywordTypes * getKeywordByType(enum lineType_e type,
 					      struct configFileInfo * cfi) {
-    struct keywordTypes * kw;
-    for (kw = cfi->keywords; kw->key; kw++) {
+    for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
 	if (kw->type == type)
 	    return kw;
     }
@@ -601,8 +602,7 @@
 
 static enum lineType_e getTypeByKeyword(char * keyword, 
 					struct configFileInfo * cfi) {
-    struct keywordTypes * kw;
-    for (kw = cfi->keywords; kw->key; kw++) {
+    for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
 	if (!strcmp(keyword, kw->key))
 	    return kw->type;
     }
@@ -689,7 +689,6 @@
 }
 
 struct singleLine * lineDup(struct singleLine * line) {
-    int i;
     struct singleLine * newLine = malloc(sizeof(*newLine));
 
     newLine->indent = strdup(line->indent);
@@ -699,7 +698,7 @@
     newLine->elements = malloc(sizeof(*newLine->elements) * 
 			       newLine->numElements);
 
-    for (i = 0; i < newLine->numElements; i++) {
+    for (int i = 0; i < newLine->numElements; i++) {
 	newLine->elements[i].indent = strdup(line->elements[i].indent);
 	newLine->elements[i].item = strdup(line->elements[i].item);
     }
@@ -708,11 +707,9 @@
 }
 
 static void lineFree(struct singleLine * line) {
-    int i;
-
     if (line->indent) free(line->indent);
 
-    for (i = 0; i < line->numElements; i++) {
+    for (int i = 0; i < line->numElements; i++) {
 	free(line->elements[i].item); 
 	free(line->elements[i].indent); 
     }
@@ -723,11 +720,21 @@
 
 static int lineWrite(FILE * out, struct singleLine * line,
 		     struct configFileInfo * cfi) {
-    int i;
-
     if (fprintf(out, "%s", line->indent) == -1) return -1;
 
-    for (i = 0; i < line->numElements; i++) {
+    for (int i = 0; i < line->numElements; i++) {
+	/* Need to handle this, because we strip the quotes from
+	 * menuentry when read it. */
+	if (line->type == LT_MENUENTRY && i == 1) {
+	    if(!isquote(*line->elements[i].item))
+		fprintf(out, "\'%s\'", line->elements[i].item);
+	    else
+		fprintf(out, "%s", line->elements[i].item);
+	    fprintf(out, "%s", line->elements[i].indent);
+
+	    continue;
+	}
+
 	if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)
 	    if (fputc('"', out) == EOF) return -1;
 
@@ -821,10 +828,9 @@
 	    if (*line->elements[0].item == '#') {
 		char * fullLine;
 		int len;
-		int i;
 
 		len = strlen(line->indent);
-		for (i = 0; i < line->numElements; i++)
+		for (int i = 0; i < line->numElements; i++)
 		    len += strlen(line->elements[i].item) + 
 			   strlen(line->elements[i].indent);
 
@@ -833,7 +839,7 @@
 		free(line->indent);
 		line->indent = fullLine;
 
-		for (i = 0; i < line->numElements; i++) {
+		for (int i = 0; i < line->numElements; i++) {
 		    strcat(fullLine, line->elements[i].item);
 		    strcat(fullLine, line->elements[i].indent);
 		    free(line->elements[i].item);
@@ -852,12 +858,10 @@
 		 * elements up more
 		 */
 		if (!isspace(kw->separatorChar)) {
-		    int i;
 		    char indent[2] = "";
 		    indent[0] = kw->separatorChar;
-		    for (i = 1; i < line->numElements; i++) {
+		    for (int i = 1; i < line->numElements; i++) {
 			char *p;
-			int j;
 			int numNewElements;
 
 			numNewElements = 0;
@@ -873,7 +877,7 @@
 					    sizeof(*line->elements) * elementsAlloced);
 			}
 
-			for (j = line->numElements; j > i; j--) {
+			for (int j = line->numElements; j > i; j--) {
 				line->elements[j + numNewElements] = line->elements[j];
 			}
 			line->numElements += numNewElements;
@@ -886,13 +890,11 @@
 					break;
 				}
 
-				free(line->elements[i].indent);
+				line->elements[i + 1].indent = line->elements[i].indent;
 				line->elements[i].indent = strdup(indent);
 				*p++ = '\0';
 				i++;
 				line->elements[i].item = strdup(p);
-				line->elements[i].indent = strdup("");
-				p = line->elements[i].item;
 			}
 		    }
 		}
@@ -913,7 +915,7 @@
     struct singleLine * last = NULL, * line, * defaultLine = NULL;
     char * end;
     struct singleEntry * entry = NULL;
-    int i, len;
+    int len;
     char * buf;
 
     if (!strcmp(inName, "-")) {
@@ -976,11 +978,10 @@
 	}
 
 	if (line->type == LT_SET_VARIABLE) {
-	    int i;
 	    dbgPrintf("found 'set' command (%d elements): ", line->numElements);
 	    dbgPrintf("%s", line->indent);
-	    for (i = 0; i < line->numElements; i++)
-		dbgPrintf("%s\"%s\"", line->elements[i].indent, line->elements[i].item);
+	    for (int i = 0; i < line->numElements; i++)
+		dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
 	    dbgPrintf("\n");
 	    struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
 	    if (kwType && line->numElements == 3 &&
@@ -1007,8 +1008,7 @@
 	     * This only applies to grub, but that's the only place we
 	     * should find LT_MBMODULE lines anyway.
 	     */
-	    struct singleLine * l;
-	    for (l = entry->lines; l; l = l->next) {
+	    for (struct singleLine *l = entry->lines; l; l = l->next) {
 		if (l->type == LT_HYPER)
 		    break;
 		else if (l->type == LT_KERNEL) {
@@ -1028,14 +1028,14 @@
 	} else if (line->type == LT_TITLE && line->numElements > 1) {
 	    /* make the title a single argument (undoing our parsing) */
 	    len = 0;
-	    for (i = 1; i < line->numElements; i++) {
+	    for (int i = 1; i < line->numElements; i++) {
 		len += strlen(line->elements[i].item);
 		len += strlen(line->elements[i].indent);
 	    }
 	    buf = malloc(len + 1);
 	    *buf = '\0';
 
-	    for (i = 1; i < line->numElements; i++) {
+	    for (int i = 1; i < line->numElements; i++) {
 		strcat(buf, line->elements[i].item);
 		free(line->elements[i].item);
 
@@ -1049,7 +1049,71 @@
 		    line->elements[line->numElements - 1].indent;
 	    line->elements[1].item = buf;
 	    line->numElements = 2;
+	} else if (line->type == LT_MENUENTRY && line->numElements > 3) {
+	    /* let --remove-kernel="TITLE=what" work */
+	    len = 0;
+	    char *extras;
+	    char *title;
+
+	    for (int i = 1; i < line->numElements; i++) {
+		len += strlen(line->elements[i].item);
+		len += strlen(line->elements[i].indent);
+	    }
+	    buf = malloc(len + 1);
+	    *buf = '\0';
+
+	    /* allocate mem for extra flags. */
+	    extras = malloc(len + 1);
+	    *extras = '\0';
+
+	    /* get title. */
+	    for (int i = 0; i < line->numElements; i++) {
+		if (!strcmp(line->elements[i].item, "menuentry"))
+		    continue;
+		if (isquote(*line->elements[i].item))
+		    title = line->elements[i].item + 1;
+		else
+		    title = line->elements[i].item;
+
+		len = strlen(title);
+	        if (isquote(title[len-1])) {
+		    strncat(buf, title,len-1);
+		    break;
+		} else {
+		    strcat(buf, title);
+		    strcat(buf, line->elements[i].indent);
+		}
+	    }
+
+	    /* get extras */
+	    int count = 0;
+	    for (int i = 0; i < line->numElements; i++) {
+		if (count >= 2) {
+		    strcat(extras, line->elements[i].item);
+		    strcat(extras, line->elements[i].indent);
+		}
+
+		if (!strcmp(line->elements[i].item, "menuentry"))
+		    continue;
+
+		/* count ' or ", there should be two in menuentry line. */
+		if (isquote(*line->elements[i].item))
+		    count++;
+
+		len = strlen(line->elements[i].item);
 
+		if (isquote(line->elements[i].item[len -1]))
+		    count++;
+
+		/* ok, we get the final ' or ", others are extras. */
+            }
+	    line->elements[1].indent =
+		line->elements[line->numElements - 2].indent;
+	    line->elements[1].item = buf;
+	    line->elements[2].indent =
+		line->elements[line->numElements - 2].indent;
+	    line->elements[2].item = extras;
+	    line->numElements = 3;
 	} else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {
 	    /* Strip off any " which may be present; they'll be put back
 	       on write. This is one of the few (the only?) places that grubby
@@ -1058,13 +1122,13 @@
 	    if (line->numElements >= 2) {
 		int last, len;
 
-		if (*line->elements[1].item == '"')
+		if (isquote(*line->elements[1].item))
 		    memmove(line->elements[1].item, line->elements[1].item + 1,
 			    strlen(line->elements[1].item + 1) + 1);
 
 		last = line->numElements - 1;
 		len = strlen(line->elements[last].item) - 1;
-		if (line->elements[last].item[len] == '"')
+		if (isquote(line->elements[last].item[len]))
 		    line->elements[last].item[len] = '\0';
 	    }
 	}
@@ -1123,7 +1187,11 @@
 
     dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");
     if (defaultLine) {
-	if (cfi->defaultIsVariable) {
+        if (defaultLine->numElements > 2 &&
+	    cfi->defaultSupportSaved &&
+	    !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
+	    cfg->defaultImage = DEFAULT_SAVED_GRUB2;
+	} else if (cfi->defaultIsVariable) {
 	    char *value = defaultLine->elements[2].item;
 	    while (*value && (*value == '"' || *value == '\'' ||
 		    *value == ' ' || *value == '\t'))
@@ -1140,7 +1208,7 @@
 	    cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);
 	    if (*end) cfg->defaultImage = -1;
 	} else if (defaultLine->numElements >= 2) {
-	    i = 0;
+	    int i = 0;
 	    while ((entry = findEntryByIndex(cfg, i))) {
 		for (line = entry->lines; line; line = line->next)
 		    if (line->type == LT_TITLE) break;
@@ -1180,6 +1248,8 @@
 
     if (cfg->defaultImage == DEFAULT_SAVED)
 	fprintf(out, "%sdefault%ssaved\n", indent, separator);
+    else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2)
+	fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
     else if (cfg->defaultImage > -1) {
 	if (cfg->cfi->defaultIsIndex) {
 	    if (cfg->cfi->defaultIsVariable) {
@@ -1240,7 +1310,7 @@
 
 	    /* most likely the symlink is relative, so change our
 	       directory to the dir of the symlink */
-            rc = chdir(dirname(strdupa(outName)));
+            rc = chdir(dirname(outName));
 	    do {
 		buf = alloca(len + 1);
 		rc = readlink(basename(outName), buf, len);
@@ -1378,6 +1448,8 @@
     buf[rc] = '\0';
     chptr = buf;
 
+    char *foundanswer = NULL;
+
     while (chptr && chptr != buf+rc) {
         devname = chptr;
 
@@ -1405,13 +1477,8 @@
          * for '/' obviously.
          */
         if (*(++chptr) == '/' && *(++chptr) == ' ') {
-            /*
-             * Move back 2, which is the first space after the device name, set
-             * it to \0 so strdup will just get the devicename.
-             */
-            chptr -= 2;
-            *chptr = '\0';
-            return strdup(devname);
+            /* remember the last / entry in mtab */
+           foundanswer = devname;
         }
 
         /* Next line */
@@ -1420,6 +1487,13 @@
             chptr++;
     }
 
+    /* Return the last / entry found */
+    if (foundanswer) {
+        chptr = strchr(foundanswer, ' ');
+        *chptr = '\0';
+        return strdup(foundanswer);
+    }
+
     return NULL;
 }
 
@@ -1430,7 +1504,19 @@
     for (line = entry->lines; line; line = line->next) {
 	fprintf(stderr, "DBG: %s", line->indent);
 	for (i = 0; i < line->numElements; i++) {
-		fprintf(stderr, "%s%s",
+	    /* Need to handle this, because we strip the quotes from
+	     * menuentry when read it. */
+	    if (line->type == LT_MENUENTRY && i == 1) {
+		if(!isquote(*line->elements[i].item))
+		    fprintf(stderr, "\'%s\'", line->elements[i].item);
+		else
+		    fprintf(stderr, "%s", line->elements[i].item);
+		fprintf(stderr, "%s", line->elements[i].indent);
+		
+		continue;
+	    }
+	    
+	    fprintf(stderr, "%s%s",
 		    line->elements[i].item, line->elements[i].indent);
 	}
 	fprintf(stderr, "\n");
@@ -1457,7 +1543,7 @@
 {
 	int slen;
 
-	if (!s && !s[0])
+	if (!s || !s[0])
 		return 0;
 	slen = strlen(s) - 1;
 
@@ -1646,7 +1732,7 @@
 
 	if (!strncmp(kernel, "TITLE=", 6)) {
 	    prefix = "";
-	    checkType = LT_TITLE;
+	    checkType = LT_TITLE|LT_MENUENTRY;
 	    kernel += 6;
 	}
 
@@ -1662,13 +1748,17 @@
 				     checkType, line);
 		if (!line) break;  /* not found in this entry */
 
-		if (line && line->numElements >= 2) {
+		if (line && line->type != LT_MENUENTRY &&
+			line->numElements >= 2) {
 		    rootspec = getRootSpecifier(line->elements[1].item);
 		    if (!strcmp(line->elements[1].item + 
 				((rootspec != NULL) ? strlen(rootspec) : 0),
 				kernel + strlen(prefix)))
 			break;
 		}
+		if(line->type == LT_MENUENTRY &&
+			!strcmp(line->elements[1].item, kernel))
+		    break;
 	    }
 
 	    /* make sure this entry has a kernel identifier; this skips
@@ -1760,7 +1850,16 @@
 		      const char * prefix) {
     struct singleEntry * entry;
 
-    if (!image) return;
+    if (!image)
+	return;
+
+    /* check and see if we're removing the default image */
+    if (isdigit(*image)) {
+	entry = findEntryByPath(cfg, image, prefix, NULL);
+	if(entry)
+	    entry->skip = 1;
+	return;
+    }
 
     while ((entry = findEntryByPath(cfg, image, prefix, NULL)))
 	entry->skip = 1;
@@ -1787,7 +1886,8 @@
 
     /* defaultImage now points to what we'd like to use, but before any order 
        changes */
-    if (config->defaultImage == DEFAULT_SAVED) 
+    if ((config->defaultImage == DEFAULT_SAVED) ||
+	(config->defaultImage == DEFAULT_SAVED_GRUB2))
       /* default is set to saved, we don't want to change it */
       return;
 
@@ -1854,7 +1954,10 @@
         return;
     }
 
-    printf("kernel=%s%s\n", prefix, line->elements[1].item);
+    if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
+	printf("kernel=%s\n", line->elements[1].item);
+    else
+	printf("kernel=%s%s\n", prefix, line->elements[1].item);
 
     if (line->numElements >= 3) {
 	printf("args=\"");
@@ -1913,11 +2016,26 @@
     line = getLineByType(LT_INITRD, entry->lines);
 
     if (line && line->numElements >= 2) {
-	printf("initrd=%s", prefix);
+	if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
+	    printf("initrd=");
+	else
+	    printf("initrd=%s", prefix);
+
 	for (i = 1; i < line->numElements; i++)
 	    printf("%s%s", line->elements[i].item, line->elements[i].indent);
 	printf("\n");
     }
+
+    line = getLineByType(LT_TITLE, entry->lines);
+    if (line) {
+	printf("title=%s\n", line->elements[1].item);
+    } else {
+	char * title;
+	line = getLineByType(LT_MENUENTRY, entry->lines);
+	title = grub2ExtractTitle(line);
+	if (title)
+	    printf("title=%s\n", title);
+    }
 }
 
 int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
@@ -2172,13 +2290,6 @@
     free(line);
 }
 
-static int isquote(char q)
-{
-    if (q == '\'' || q == '\"')
-	return 1;
-    return 0;
-}
-
 static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)
 {
     struct singleLine newLine = {
@@ -2862,7 +2973,7 @@
 static char * getInitrdVal(struct grubConfig * config,
 			   const char * prefix, struct singleLine *tmplLine,
 			   const char * newKernelInitrd,
-			   char ** extraInitrds, int extraInitrdCount)
+			   const char ** extraInitrds, int extraInitrdCount)
 {
     char *initrdVal, *end;
     int i;
@@ -2907,10 +3018,10 @@
 
 int addNewKernel(struct grubConfig * config, struct singleEntry * template, 
 	         const char * prefix,
-		 char * newKernelPath, char * newKernelTitle,
-		 char * newKernelArgs, char * newKernelInitrd,
-		 char ** extraInitrds, int extraInitrdCount,
-                 char * newMBKernel, char * newMBKernelArgs) {
+		 const char * newKernelPath, const char * newKernelTitle,
+		 const char * newKernelArgs, const char * newKernelInitrd,
+		 const char ** extraInitrds, int extraInitrdCount,
+                 const char * newMBKernel, const char * newMBKernelArgs) {
     struct singleEntry * new;
     struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
     int needs;
@@ -3472,20 +3583,20 @@
     }
 
     if (!cfi) {
+        if (grub2FindConfig(&grub2ConfigType))
+	    cfi = &grub2ConfigType;
+	else
       #ifdef __ia64__
-	cfi = &eliloConfigType;
+	    cfi = &eliloConfigType;
       #elif __powerpc__
-	cfi = &yabootConfigType;
+	    cfi = &yabootConfigType;
       #elif __sparc__
-        cfi = &siloConfigType;
+            cfi = &siloConfigType;
       #elif __s390__
-        cfi = &ziplConfigType;
+            cfi = &ziplConfigType;
       #elif __s390x__
-        cfi = &ziplConfigtype;
+            cfi = &ziplConfigtype;
       #else
-        if (grub2FindConfig(&grub2ConfigType))
-	    cfi = &grub2ConfigType;
-	else
 	    cfi = &grubConfigType;
       #endif
     }
@@ -3696,7 +3807,7 @@
     }
     if (addNewKernel(config, template, bootPrefix, newKernelPath, 
                      newKernelTitle, newKernelArgs, newKernelInitrd, 
-                     extraInitrds, extraInitrdCount,
+                     (const char **)extraInitrds, extraInitrdCount,
                      newMBKernel, newMBKernelArgs)) return 1;