/[magellan-source]/trunk/grubby/grubby.c

Diff of /trunk/grubby/grubby.c

Parent Directory | Revision Log | View Patch Patch

-revision 2688 by niro,
Wed Jul 16 10:42:34 2014 UTC
+revision 2992 by niro,
Thu Jun 30 10:35:14 2016 UTC
 Line 60 
 int debug = 0;	/* Currently just for tem
  int isEfi = 0;
- #if defined(__arch64__)
+ #if defined(__aarch64__)
  #define isEfiOnly	1
  #else
  #define isEfiOnly	0
 Line 161 
 struct configFileInfo {
      int defaultIsVariable;
      int defaultSupportSaved;
      int defaultIsSaved;
+     int defaultIsUnquoted;
      enum lineType_e entryStart;
      enum lineType_e entryEnd;
      int needsBootPrefix;
-Line 221 
 struct configFileInfo grubConfigType = {
+Line 222 
 struct configFileInfo grubConfigType = {
      .mbHyperFirst = 1,
      .mbInitRdIsModule = 1,
      .mbAllowExtraInitRds = 1,
+     .titlePosition = 1,
  };
  struct keywordTypes grub2Keywords[] = {
-Line 427 
 char *grub2ExtractTitle(struct singleLin
+Line 429 
 char *grub2ExtractTitle(struct singleLin
      /* bail out if line does not start with menuentry */
      if (strcmp(line->elements[0].item, "menuentry"))
-       return NULL;
+ 	return NULL;
      i = 1;
      current = line->elements[i].item;
-Line 436 
 char *grub2ExtractTitle(struct singleLin
+Line 438 
 char *grub2ExtractTitle(struct singleLin
      /* if second word is quoted, strip the quotes and return single word */
      if (isquote(*current) && isquote(current[current_len - 1])) {
  	char *tmp;
- 	tmp = strdup(current);
+ 	tmp = strdup(current+1);
- 	*(tmp + current_len - 1) = '\0';
+ 	if (!tmp)
- 	return ++tmp;
+ 	    return NULL;
+ 	tmp[strlen(tmp)-1] = '\0';
+ 	return tmp;
      }
      /* if no quotes, return second word verbatim */
-Line 450 
 char *grub2ExtractTitle(struct singleLin
+Line 454 
 char *grub2ExtractTitle(struct singleLin
       * whose last character is also quote (assuming it's the closing one) */
      int resultMaxSize;
      char * result;
+     /* need to ensure that ' does not match " as we search */
+     char quote_char = *current;
      resultMaxSize = sizeOfSingleLine(line);
      result = malloc(resultMaxSize);
      snprintf(result, resultMaxSize, "%s", ++current);
      i++;
      for (; i < line->numElements; ++i) {
  	current = line->elements[i].item;
-Line 463 
 char *grub2ExtractTitle(struct singleLin
+Line 469 
 char *grub2ExtractTitle(struct singleLin
  	current_indent_len = strlen(current_indent);
  	strncat(result, current_indent, current_indent_len);
- 	if (!isquote(current[current_len-1])) {
+ 	if (current[current_len-1] != quote_char) {
  	    strncat(result, current, current_len);
  	} else {
  	    strncat(result, current, current_len - 1);
-Line 581 
 struct keywordTypes extlinuxKeywords[] =
+Line 587 
 struct keywordTypes extlinuxKeywords[] =
      { "initrd",	    LT_INITRD,      ' ',	',' },
      { "append",	    LT_KERNELARGS,  ' ' },
      { "prompt",     LT_UNKNOWN,     ' ' },
+     { "fdt",        LT_DEVTREE,     ' ' },
+     { "fdtdir",     LT_DEVTREE,     ' ' },
      { NULL,	    0, 0 },
  };
  int useextlinuxmenu;
-Line 591 
 struct configFileInfo eliloConfigType =
+Line 599 
 struct configFileInfo eliloConfigType =
      .needsBootPrefix = 1,
      .argsInQuotes = 1,
      .mbConcatArgs = 1,
+     .titlePosition = 1,
  };
  struct configFileInfo liloConfigType = {
-Line 599 
 struct configFileInfo liloConfigType = {
+Line 608 
 struct configFileInfo liloConfigType = {
      .entryStart = LT_KERNEL,
      .argsInQuotes = 1,
      .maxTitleLength = 15,
+     .titlePosition = 1,
  };
  struct configFileInfo yabootConfigType = {
-Line 609 
 struct configFileInfo yabootConfigType =
+Line 619 
 struct configFileInfo yabootConfigType =
      .argsInQuotes = 1,
      .maxTitleLength = 15,
      .mbAllowExtraInitRds = 1,
+     .titlePosition = 1,
  };
  struct configFileInfo siloConfigType = {
-Line 618 
 struct configFileInfo siloConfigType = {
+Line 629 
 struct configFileInfo siloConfigType = {
      .needsBootPrefix = 1,
      .argsInQuotes = 1,
      .maxTitleLength = 15,
+     .titlePosition = 1,
  };
  struct configFileInfo ziplConfigType = {
-Line 636 
 struct configFileInfo extlinuxConfigType
+Line 648 
 struct configFileInfo extlinuxConfigType
      .needsBootPrefix = 1,
      .maxTitleLength = 255,
      .mbAllowExtraInitRds = 1,
+     .defaultIsUnquoted = 1,
+     .titlePosition = 1,
  };
  struct grubConfig {
-Line 824 
 static int isEntryStart(struct singleLin
+Line 838 
 static int isEntryStart(struct singleLin
  }
  /* extract the title from within brackets (for zipl) */
- static char * extractTitle(struct singleLine * line) {
+ static char * extractTitle(struct grubConfig *cfg, struct singleLine * line) {
-     /* bracketed title... let's extract it (leaks a byte) */
+     /* bracketed title... let's extract it */
      char * title = NULL;
      if (line->type == LT_TITLE) {
- 	title = strdup(line->elements[0].item);
+ 	char *tmp = line->elements[cfg->cfi->titlePosition].item;
- 	title++;
+ 	if (cfg->cfi->titleBracketed) {
- 	*(title + strlen(title) - 1) = '\0';
+ 	    tmp++;
+ 	    title = strdup(tmp);
+ 	    *(title + strlen(title) - 1) = '\0';
+ 	} else {
+ 	    title = strdup(tmp);
+ 	}
      } else if (line->type == LT_MENUENTRY)
  	title = strdup(line->elements[1].item);
      else
-Line 914 
 static int lineWrite(FILE * out, struct
+Line 933 
 static int lineWrite(FILE * out, struct
  	/* 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))
+ 	    if(!isquote(*line->elements[i].item)) {
- 		fprintf(out, "\'%s\'", line->elements[i].item);
+ 		int substring = 0;
- 	    else
+ 		/* If the line contains nested quotes, we did not strip
+ 		 * the "interna" quotes and we must use the right quotes
+ 		 * again when writing the updated file. */
+ 		for (int j = i; j < line->numElements; j++) {
+ 		    if (strchr(line->elements[i].item, '\'') != NULL) {
+ 		       substring = 1;
+ 		       fprintf(out, "\"%s\"", line->elements[i].item);
+ 		       break;
+ 		    }
+ 		}
+ 		if (!substring)
+ 		    fprintf(out, "\'%s\'", line->elements[i].item);
+ 	    } else {
  		fprintf(out, "%s", line->elements[i].item);
+ 	    }
  	    fprintf(out, "%s", line->elements[i].indent);
  	    continue;
-Line 1191 
 static struct grubConfig * readConfig(co
+Line 1223 
 static struct grubConfig * readConfig(co
  		cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
  		defaultLine = line;
  	    }
- 	} else if (line->type == LT_DEFAULT && line->numElements == 2) {
- 	    cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
- 	    defaultLine = line;
          } else if (iskernel(line->type)) {
  	    /* if by some freak chance this is multiboot and the "module"
  	     * lines came earlier in the template, make sure to use LT_HYPER
  	     * instead of LT_KERNEL now
  	     */
- 	    if (entry->multiboot)
+ 	    if (entry && entry->multiboot)
  		line->type = LT_HYPER;
          } else if (line->type == LT_MBMODULE) {
-Line 1226 
 static struct grubConfig * readConfig(co
+Line 1255 
 static struct grubConfig * readConfig(co
  	    cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);
  	    if (*end) cfg->fallbackImage = -1;
- 	} else if (line->type == LT_TITLE && line->numElements > 1) {
+ 	} else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) ||
- 	    /* make the title a single argument (undoing our parsing) */
+                 (line->type == LT_TITLE && line->numElements > 1)) {
+ 	    /* make the title/default a single argument (undoing our parsing) */
  	    len = 0;
  	    for (int i = 1; i < line->numElements; i++) {
  		len += strlen(line->elements[i].item);
-Line 1255 
 static struct grubConfig * readConfig(co
+Line 1285 
 static struct grubConfig * readConfig(co
  	    len = 0;
  	    char *extras;
  	    char *title;
+ 	    /* initially unseen value */
+ 	    char quote_char = '\0';
  	    for (int i = 1; i < line->numElements; i++) {
  		len += strlen(line->elements[i].item);
-Line 1271 
 static struct grubConfig * readConfig(co
+Line 1303 
 static struct grubConfig * readConfig(co
  	    for (int i = 0; i < line->numElements; i++) {
  		if (!strcmp(line->elements[i].item, "menuentry"))
  		    continue;
- 		if (isquote(*line->elements[i].item))
+ 		if (isquote(*line->elements[i].item) && quote_char == '\0') {
+ 		    /* ensure we properly pair off quotes */
+ 		    quote_char = *line->elements[i].item;
  		    title = line->elements[i].item + 1;
- 		else
+ 		} else {
  		    title = line->elements[i].item;
+ 		}
  		len = strlen(title);
- 	        if (isquote(title[len-1])) {
+ 	        if (title[len-1] == quote_char) {
  		    strncat(buf, title,len-1);
  		    break;
  		} else {
-Line 1288 
 static struct grubConfig * readConfig(co
+Line 1323 
 static struct grubConfig * readConfig(co
  	    /* get extras */
  	    int count = 0;
+ 	    quote_char = '\0';
  	    for (int i = 0; i < line->numElements; i++) {
  		if (count >= 2) {
  		    strcat(extras, line->elements[i].item);
-Line 1298 
 static struct grubConfig * readConfig(co
+Line 1334 
 static struct grubConfig * readConfig(co
  		    continue;
  		/* count ' or ", there should be two in menuentry line. */
- 		if (isquote(*line->elements[i].item))
+ 		if (isquote(*line->elements[i].item) && quote_char == '\0') {
+ 		    /* ensure we properly pair off quotes */
+ 	            quote_char = *line->elements[i].item;
  		    count++;
+ 		}
  		len = strlen(line->elements[i].item);
- 		if (isquote(line->elements[i].item[len -1]))
+ 		if (line->elements[i].item[len -1] == quote_char)
  		    count++;
  		/* ok, we get the final ' or ", others are extras. */
-Line 1334 
 static struct grubConfig * readConfig(co
+Line 1373 
 static struct grubConfig * readConfig(co
  	    }
  	}
+ 	if (line->type == LT_DEFAULT && line->numElements == 2) {
+ 	    cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
+ 	    defaultLine = line;
+ 	}
  	/* If we find a generic config option which should live at the
  	   top of the file, move it there. Old versions of grubby were
  	   probably responsible for putting new images in the wrong
-Line 1435 
 static struct grubConfig * readConfig(co
+Line 1479 
 static struct grubConfig * readConfig(co
                                  line->elements[1].item)) break;
                  } else if (line) {
                      if (!strcmp(defaultLine->elements[1].item,
-                                 extractTitle(line))) break;
+                                 extractTitle(cfg, line))) break;
                  }
  		i++;
  		entry = NULL;
-Line 1486 
 static void writeDefault(FILE * out, cha
+Line 1530 
 static void writeDefault(FILE * out, cha
  	    if (!line)
  		line = getLineByType(LT_TITLE, entry->lines);
  	    if (line) {
- 		title = extractTitle(line);
+ 		title = extractTitle(cfg, line);
  		if (title)
  		    cfg->cfi->setEnv(cfg->cfi, "saved_entry", title);
  	    }
-Line 1524 
 static void writeDefault(FILE * out, cha
+Line 1568 
 static void writeDefault(FILE * out, cha
              else if (line && (line->numElements == 1) &&
                       cfg->cfi->titleBracketed) {
  		fprintf(out, "%sdefault%s%s\n", indent, separator,
-                         extractTitle(line));
+                         extractTitle(cfg, line));
              }
  	}
      }
-Line 1955 
 struct singleEntry * findEntryByPath(str
+Line 1999 
 struct singleEntry * findEntryByPath(str
  	}
  	indexVars[i + 1] = -1;
  	i = 0;
  	if (index) {
- 	    while (i < *index) i++;
+ 	    while (i < *index) {
- 	    if (indexVars[i] == -1) return NULL;
+ 		i++;
+ 		if (indexVars[i] == -1) return NULL;
+ 	    }
  	}
  	entry = findEntryByIndex(config, indexVars[i]);
-Line 2113 
 struct singleEntry * findTemplate(struct
+Line 2159 
 struct singleEntry * findTemplate(struct
  		} else {
  		    entry = findEntryByTitle(cfg, defTitle, &index);
  		}
- 		if (entry)
+ 		if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
  		    cfg->defaultImage = index;
+ 		    if (indexPtr)
+ 			*indexPtr = index;
+ 		    return entry;
+ 		}
  	    }
  	}
      } else if (cfg->defaultImage > -1) {
-Line 2271 
 void displayEntry(struct singleEntry * e
+Line 2321 
 void displayEntry(struct singleEntry * e
      struct singleLine * line;
      char * root = NULL;
      int i;
+     int j;
      printf("index=%d\n", index);
-Line 2358 
 void displayEntry(struct singleEntry * e
+Line 2409 
 void displayEntry(struct singleEntry * e
      } else {
  	char * title;
  	line = getLineByType(LT_MENUENTRY, entry->lines);
- 	title = grub2ExtractTitle(line);
+ 	if (line) {
- 	if (title)
+ 	    title = grub2ExtractTitle(line);
- 	    printf("title=%s\n", title);
+ 	    if (title)
+ 		printf("title=%s\n", title);
+ 	}
+     }
+     for (j = 0, line = entry->lines; line; line = line->next) {
+ 	if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
+ 	    if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
+ 		printf("mbmodule%d=", j);
+ 	    else
+ 		printf("mbmodule%d=%s", j, prefix);
+ 	    for (i = 1; i < line->numElements; i++)
+ 		printf("%s%s", line->elements[i].item, line->elements[i].indent);
+ 	    printf("\n");
+ 	    j++;
+ 	}
      }
  }
-Line 3283 
 int updateImage(struct grubConfig * cfg,
+Line 3350 
 int updateImage(struct grubConfig * cfg,
  }
  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
- 		 const char * image, const char * prefix, const char * initrd) {
+ 		 const char * image, const char * prefix, const char * initrd,
+ 		 const char * title) {
      struct singleEntry * entry;
      struct singleLine * line, * kernelLine, *endLine = NULL;
      int index = 0;
      if (!image) return 0;
-     for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {
+     for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
          kernelLine = getLineByType(LT_MBMODULE, entry->lines);
          if (!kernelLine) continue;
+ 	/* if title is supplied, the entry's title must match it. */
+ 	if (title) {
+ 	    char *linetitle;
+ 	    line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
+ 	    if (!line)
+ 		continue;
+ 	    linetitle = extractTitle(cfg, line);
+ 	    if (!linetitle)
+ 		continue;
+ 	    if (strcmp(title, linetitle)) {
+ 		free(linetitle);
+ 		continue;
+ 	    }
+ 	    free(linetitle);
+ 	}
          if (prefix) {
              int prefixLen = strlen(prefix);
              if (!strncmp(initrd, prefix, prefixLen))
-Line 3319 
 int addMBInitrd(struct grubConfig * cfg,
+Line 3405 
 int addMBInitrd(struct grubConfig * cfg,
  }
  int updateInitrd(struct grubConfig * cfg, const char * image,
-                  const char * prefix, const char * initrd) {
+                  const char * prefix, const char * initrd, const char * title) {
      struct singleEntry * entry;
      struct singleLine * line, * kernelLine, *endLine = NULL;
      int index = 0;
-Line 3330 
 int updateInitrd(struct grubConfig * cfg
+Line 3416 
 int updateInitrd(struct grubConfig * cfg
          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
          if (!kernelLine) continue;
+ 	/* if title is supplied, the entry's title must match it. */
+ 	if (title) {
+ 	    char *linetitle;
+ 	    line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
+ 	    if (!line)
+ 		continue;
+ 	    linetitle = extractTitle(cfg, line);
+ 	    if (!linetitle)
+ 		continue;
+ 	    if (strcmp(title, linetitle)) {
+ 		free(linetitle);
+ 		continue;
+ 	    }
+ 	    free(linetitle);
+ 	}
          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
          if (line)
              removeLine(entry, line);
-Line 4033 
 int addNewKernel(struct grubConfig * con
+Line 4137 
 int addNewKernel(struct grubConfig * con
  	}
      }
+     struct singleLine *endLine = NULL;
+     endLine = getLineByType(LT_ENTRY_END, new->lines);
+     if (endLine) {
+ 	    removeLine(new, endLine);
+ 	    needs |= NEED_END;
+     }
      /* add the remainder of the lines, i.e. those that either
       * weren't present in the template, or in the case of no template,
       * all the lines following the entryStart.
-Line 4091 
 int addNewKernel(struct grubConfig * con
+Line 4202 
 int addNewKernel(struct grubConfig * con
  			config->secondaryIndent, NULL);
  	needs &= ~NEED_END;
      }
      if (needs) {
  	printf(_("grubby: needs=%d, aborting\n"), needs);
  	abort();
-Line 4102 
 int addNewKernel(struct grubConfig * con
+Line 4214 
 int addNewKernel(struct grubConfig * con
      return 0;
  }
- static void traceback(int signum)
- {
-     void *array[40];
-     size_t size;
-     signal(SIGSEGV, SIG_DFL);
-     memset(array, '\0', sizeof (array));
-     size = backtrace(array, 40);
-     fprintf(stderr, "grubby received SIGSEGV!  Backtrace (%ld):\n",
-             (unsigned long)size);
-     backtrace_symbols_fd(array, size, STDERR_FILENO);
-     exit(1);
- }
  int main(int argc, const char ** argv) {
      poptContext optCon;
      const char * grubConfig = NULL;
-Line 4196 
 int main(int argc, const char ** argv) {
+Line 4293 
 int main(int argc, const char ** argv) {
  	    _("display the title of the default kernel") },
  	{ "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
  	    _("device tree file for new stanza"), _("dtb-path") },
+ 	{ "devtreedir", 0, POPT_ARG_STRING, &newDevTreePath, 0,
+ 	    _("device tree directory for new stanza"), _("dtb-path") },
  	{ "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
  	    _("configure elilo bootloader") },
  	{ "efi", 0, POPT_ARG_NONE, &isEfi, 0,
-Line 4257 
 int main(int argc, const char ** argv) {
+Line 4356 
 int main(int argc, const char ** argv) {
      useextlinuxmenu=0;
-     signal(SIGSEGV, traceback);
      int i = 0;
      for (int j = 1; j < argc; j++)
  	i += strlen(argv[j]) + 1;
-Line 4336 
 int main(int argc, const char ** argv) {
+Line 4433 
 int main(int argc, const char ** argv) {
      }
      if (!cfi) {
-         if (grub2FindConfig(&grub2ConfigType))
+         if (grub2FindConfig(&grub2ConfigType)) {
  	    cfi = &grub2ConfigType;
- 	else
+ 	    if (envPath)
+ 		cfi->envFile = envPath;
+         } else
        #ifdef __ia64__
  	    cfi = &eliloConfigType;
        #elif __powerpc__
-Line 4380 
 int main(int argc, const char ** argv) {
+Line 4479 
 int main(int argc, const char ** argv) {
      if (newKernelPath && !newKernelTitle) {
  	fprintf(stderr, _("grubby: kernel title must be specified\n"));
  	return 1;
-     } else if (!newKernelPath && (newKernelTitle  || copyDefault ||
+     } else if (!newKernelPath && (copyDefault ||
  				  (newKernelInitrd && !updateKernelPath)||
  				  makeDefault || extraInitrdCount > 0)) {
  	fprintf(stderr, _("grubby: kernel path expected\n"));
-Line 4552 
 int main(int argc, const char ** argv) {
+Line 4651 
 int main(int argc, const char ** argv) {
  	struct singleLine * line;
  	struct singleEntry * entry;
- 	if (config->defaultImage == -1) return 0;
+ 	if (config->defaultImage == -1)
+ 	    return 0;
  	if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
  		cfi->defaultIsSaved)
  	    config->defaultImage = 0;
  	entry = findEntryByIndex(config, config->defaultImage);
- 	if (!entry) return 0;
+ 	if (!entry)
+ 		return 0;
  	if (!configureGrub2) {
- 	  line = getLineByType(LT_TITLE, entry->lines);
+ 	    char *title;
- 	  if (!line) return 0;
+ 	    line = getLineByType(LT_TITLE, entry->lines);
- 	  printf("%s\n", line->elements[1].item);
+ 	    if (!line)
+ 		return 0;
+ 	    title = extractTitle(config, line);
+ 	    if (!title)
+ 		return 0;
+ 	    printf("%s\n", title);
+ 	    free(title);
  	} else {
- 	  char * title;
+ 	    char * title;
- 	  dbgPrintf("This is GRUB2, default title is embeded in menuentry\n");
+ 	    dbgPrintf("This is GRUB2, default title is embeded in menuentry\n");
- 	  line = getLineByType(LT_MENUENTRY, entry->lines);
+ 	    line = getLineByType(LT_MENUENTRY, entry->lines);
- 	  if (!line) return 0;
+ 	    if (!line)
- 	  title = grub2ExtractTitle(line);
+ 		return 0;
- 	  if (title)
+ 	    title = grub2ExtractTitle(line);
- 	    printf("%s\n", title);
+ 	    if (title)
+ 		printf("%s\n", title);
  	}
  	return 0;
-Line 4602 
 int main(int argc, const char ** argv) {
+Line 4709 
 int main(int argc, const char ** argv) {
      if (updateKernelPath && newKernelInitrd) {
  	    if (newMBKernel) {
  		    if (addMBInitrd(config, newMBKernel, updateKernelPath,
- 					bootPrefix, newKernelInitrd))
+ 					bootPrefix, newKernelInitrd,
+ 					newKernelTitle))
  			    return 1;
  	    } else {
  		    if (updateInitrd(config, updateKernelPath, bootPrefix,
- 					newKernelInitrd))
+ 					newKernelInitrd, newKernelTitle))
  			return 1;
  	    }
      }

 Legend:



Removed from v.2688
 


changed lines


 
Added in v.2992
 Legend:



Removed from v.2688
 


changed lines


 
Added in v.2992
-Removed from v.2688
+Added in v.2992