/[magellan-source]/tags/grubby-8_32/grubby.c

Diff of /tags/grubby-8_32/grubby.c

Parent Directory | Revision Log | View Patch Patch

-revision 2246 by niro,
Mon Oct 21 13:53:05 2013 UTC
+revision 2257 by niro,
Mon Oct 21 14:01:48 2013 UTC
 Line 136 
 struct configFileInfo;
  typedef const char *(*findConfigFunc)(struct configFileInfo *);
  typedef const int (*writeLineFunc)(struct configFileInfo *,
  				struct singleLine *line);
+ typedef char *(*getEnvFunc)(struct configFileInfo *, char *name);
+ typedef int (*setEnvFunc)(struct configFileInfo *, char *name, char *value);
  struct configFileInfo {
      char * defaultConfig;
      findConfigFunc findConfig;
      writeLineFunc writeLine;
+     getEnvFunc getEnv;
+     setEnvFunc setEnv;
      struct keywordTypes * keywords;
      int caseInsensitive;
      int defaultIsIndex;
      int defaultIsVariable;
      int defaultSupportSaved;
+     int defaultIsSaved;
      enum lineType_e entryStart;
      enum lineType_e entryEnd;
      int needsBootPrefix;
-Line 157 
 struct configFileInfo {
+Line 162 
 struct configFileInfo {
      int mbInitRdIsModule;
      int mbConcatArgs;
      int mbAllowExtraInitRds;
+     char *envFile;
  };
  struct keywordTypes grubKeywords[] = {
-Line 261 
 const char *grub2FindConfig(struct confi
+Line 267 
 const char *grub2FindConfig(struct confi
      return configFiles[i];
  }
+ /* kind of hacky.  It'll give the first 1024 bytes, ish. */
+ static char *grub2GetEnv(struct configFileInfo *info, char *name)
+ {
+     static char buf[1025];
+     char *s = NULL;
+     char *ret = NULL;
+     char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";
+     int rc = asprintf(&s, "grub2-editenv %s list | grep '^%s='", envFile, name);
+     if (rc < 0)
+ 	return NULL;
+     FILE *f = popen(s, "r");
+     if (!f)
+ 	goto out;
+     memset(buf, '\0', sizeof (buf));
+     ret = fgets(buf, 1024, f);
+     pclose(f);
+     if (ret) {
+ 	ret += strlen(name) + 1;
+ 	ret[strlen(ret) - 1] = '\0';
+     }
+     dbgPrintf("grub2GetEnv(%s): %s\n", name, ret);
+ out:
+     free(s);
+     return ret;
+ }
+ static int sPopCount(const char *s, const char *c)
+ {
+     int ret = 0;
+     if (!s)
+ 	return -1;
+     for (int i = 0; s[i] != '\0'; i++)
+ 	for (int j = 0; c[j] != '\0'; j++)
+ 	    if (s[i] == c[j])
+ 		ret++;
+     return ret;
+ }
+ static char *shellEscape(const char *s)
+ {
+     int l = strlen(s) + sPopCount(s, "'") * 2;
+     char *ret = calloc(l+1, sizeof (*ret));
+     if (!ret)
+ 	return NULL;
+     for (int i = 0, j = 0; s[i] != '\0'; i++, j++) {
+ 	if (s[i] == '\'')
+ 	    ret[j++] = '\\';
+ 	ret[j] = s[i];
+     }
+     return ret;
+ }
+ static void unquote(char *s)
+ {
+     int l = strlen(s);
+     if ((s[l-1] == '\'' && s[0] == '\'') || (s[l-1] == '"' && s[0] == '"')) {
+ 	memmove(s, s+1, l-2);
+ 	s[l-2] = '\0';
+     }
+ }
+ static int grub2SetEnv(struct configFileInfo *info, char *name, char *value)
+ {
+     char *s = NULL;
+     int rc = 0;
+     char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";
+     unquote(value);
+     value = shellEscape(value);
+     if (!value)
+ 	    return -1;
+     rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value);
+     free(value);
+     if (rc <0)
+ 	return -1;
+     dbgPrintf("grub2SetEnv(%s): %s\n", name, s);
+     rc = system(s);
+     free(s);
+     return rc;
+ }
+ /* this is a gigantic hack to avoid clobbering grub2 variables... */
+ static int is_special_grub2_variable(const char *name)
+ {
+     if (!strcmp(name,"\"${next_entry}\""))
+ 	return 1;
+     if (!strcmp(name,"\"${prev_saved_entry}\""))
+ 	return 1;
+     return 0;
+ }
  int sizeOfSingleLine(struct singleLine * line) {
    int count = 0;
-Line 355 
 char *grub2ExtractTitle(struct singleLin
+Line 460 
 char *grub2ExtractTitle(struct singleLin
  struct configFileInfo grub2ConfigType = {
      .findConfig = grub2FindConfig,
+     .getEnv = grub2GetEnv,
+     .setEnv = grub2SetEnv,
      .keywords = grub2Keywords,
      .defaultIsIndex = 1,
      .defaultSupportSaved = 1,
-Line 534 
 struct singleEntry * findEntryByIndex(st
+Line 641 
 struct singleEntry * findEntryByIndex(st
  struct singleEntry * findEntryByPath(struct grubConfig * cfg,
  				     const char * path, const char * prefix,
  				     int * index);
+ struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
+ 				      int * index);
  static int readFile(int fd, char ** bufPtr);
  static void lineInit(struct singleLine * line);
  struct singleLine * lineDup(struct singleLine * line);
-Line 691 
 static int isEntryStart(struct singleLin
+Line 800 
 static int isEntryStart(struct singleLin
  /* extract the title from within brackets (for zipl) */
  static char * extractTitle(struct singleLine * line) {
      /* bracketed title... let's extract it (leaks a byte) */
-     char * title;
+     char * title = NULL;
-     title = strdup(line->elements[0].item);
+     if (line->type == LT_TITLE) {
-     title++;
+ 	title = strdup(line->elements[0].item);
-     *(title + strlen(title) - 1) = '\0';
+ 	title++;
+ 	*(title + strlen(title) - 1) = '\0';
+     } else if (line->type == LT_MENUENTRY)
+ 	title = strdup(line->elements[1].item);
+     else
+ 	return NULL;
      return title;
  }
-Line 1036 
 static struct grubConfig * readConfig(co
+Line 1150 
 static struct grubConfig * readConfig(co
  	    dbgPrintf("\n");
  	    struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
  	    if (kwType && line->numElements == 3 &&
- 		    !strcmp(line->elements[1].item, kwType->key)) {
+ 		    !strcmp(line->elements[1].item, kwType->key) &&
+ 		    !is_special_grub2_variable(line->elements[2].item)) {
  		dbgPrintf("Line sets default config\n");
  		cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
  		defaultLine = line;
-Line 1241 
 static struct grubConfig * readConfig(co
+Line 1356 
 static struct grubConfig * readConfig(co
          if (defaultLine->numElements > 2 &&
  	    cfi->defaultSupportSaved &&
  	    !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
- 	    cfg->defaultImage = DEFAULT_SAVED_GRUB2;
+ 		cfg->cfi->defaultIsSaved = 1;
+ 		cfg->defaultImage = DEFAULT_SAVED_GRUB2;
+ 		if (cfg->cfi->getEnv) {
+ 		    char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
+ 		    if (defTitle) {
+ 			int index = 0;
+ 			entry = findEntryByTitle(cfg, defTitle, &index);
+ 			if (entry)
+ 			    cfg->defaultImage = index;
+ 		    }
+ 		}
  	} else if (cfi->defaultIsVariable) {
  	    char *value = defaultLine->elements[2].item;
  	    while (*value && (*value == '"' || *value == '\'' ||
-Line 1282 
 static struct grubConfig * readConfig(co
+Line 1407 
 static struct grubConfig * readConfig(co
  	        cfg->defaultImage = -1;
  	    }
  	}
+     } else if (cfg->cfi->defaultIsSaved && cfg->cfi->getEnv) {
+ 	char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
+ 	if (defTitle) {
+ 	    int index = 0;
+ 	    entry = findEntryByTitle(cfg, defTitle, &index);
+ 	    if (entry)
+ 		cfg->defaultImage = index;
+ 	}
      } else {
          cfg->defaultImage = 0;
      }
-Line 1299 
 static void writeDefault(FILE * out, cha
+Line 1432 
 static void writeDefault(FILE * out, cha
      if (cfg->defaultImage == DEFAULT_SAVED)
  	fprintf(out, "%sdefault%ssaved\n", indent, separator);
-     else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2)
+     else if (cfg->cfi->defaultIsSaved) {
  	fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
-     else if (cfg->defaultImage > -1) {
+ 	if (cfg->defaultImage >= 0 && cfg->cfi->setEnv) {
+ 	    char *title;
+ 	    entry = findEntryByIndex(cfg, cfg->defaultImage);
+ 	    line = getLineByType(LT_MENUENTRY, entry->lines);
+ 	    if (!line)
+ 		line = getLineByType(LT_TITLE, entry->lines);
+ 	    if (line) {
+ 		title = extractTitle(line);
+ 		if (title)
+ 		    cfg->cfi->setEnv(cfg->cfi, "saved_entry", title);
+ 	    }
+ 	}
+     } else if (cfg->defaultImage > -1) {
  	if (cfg->cfi->defaultIsIndex) {
  	    if (cfg->cfi->defaultIsVariable) {
  	        fprintf(out, "%sset default=\"%d\"\n", indent,
-Line 1404 
 static int writeConfig(struct grubConfig
+Line 1549 
 static int writeConfig(struct grubConfig
      while (line) {
          if (line->type == LT_SET_VARIABLE && defaultKw &&
  		line->numElements == 3 &&
- 		!strcmp(line->elements[1].item, defaultKw->key)) {
+ 		!strcmp(line->elements[1].item, defaultKw->key) &&
+ 		!is_special_grub2_variable(line->elements[2].item)) {
  	    writeDefault(out, line->indent, line->elements[0].indent, cfg);
  	    needs &= ~MAIN_DEFAULT;
  	} else if (line->type == LT_DEFAULT) {
-Line 1859 
 struct singleEntry * findEntryByPath(str
+Line 2005 
 struct singleEntry * findEntryByPath(str
      return entry;
  }
+ struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
+ 				      int * index) {
+     struct singleEntry * entry;
+     struct singleLine * line;
+     int i;
+     char * newtitle;
+     for (i = 0, entry = cfg->entries; entry; entry = entry->next, i++) {
+ 	if (index && i < *index)
+ 	    continue;
+ 	line = getLineByType(LT_TITLE, entry->lines);
+ 	if (!line)
+ 	    line = getLineByType(LT_MENUENTRY, entry->lines);
+ 	if (!line)
+ 	    continue;
+ 	newtitle = grub2ExtractTitle(line);
+ 	if (!newtitle)
+ 	    continue;
+ 	if (!strcmp(title, newtitle))
+ 	    break;
+     }
+     if (!entry)
+ 	return NULL;
+     if (index)
+ 	*index = i;
+     return entry;
+ }
  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index) {
      struct singleEntry * entry;
-Line 1881 
 struct singleEntry * findTemplate(struct
+Line 2057 
 struct singleEntry * findTemplate(struct
      struct singleEntry * entry, * entry2;
      int index;
-     if (cfg->defaultImage > -1) {
+     if (cfg->cfi->defaultIsSaved) {
+ 	if (cfg->cfi->getEnv) {
+ 	    char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry");
+ 	    if (defTitle) {
+ 		int index = 0;
+ 		entry = findEntryByTitle(cfg, defTitle, &index);
+ 	    }
+ 	}
+     } else if (cfg->defaultImage > -1) {
  	entry = findEntryByIndex(cfg, cfg->defaultImage);
  	if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
  	    if (indexPtr) *indexPtr = cfg->defaultImage;
-Line 3835 
 int main(int argc, const char ** argv) {
+Line 4019 
 int main(int argc, const char ** argv) {
      char * removeArgs = NULL;
      char * kernelInfo = NULL;
      char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL };
+     char * envPath = NULL;
      const char * chptr = NULL;
      struct configFileInfo * cfi = NULL;
      struct grubConfig * config;
-Line 3886 
 int main(int argc, const char ** argv) {
+Line 4071 
 int main(int argc, const char ** argv) {
  	    _("configure elilo bootloader") },
  	{ "efi", 0, POPT_ARG_NONE, &isEfi, 0,
  	    _("force grub2 stanzas to use efi") },
+ 	{ "env", 0, POPT_ARG_STRING, &envPath, 0,
+ 	    _("path for environment data"),
+ 	    _("path") },
  	{ "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
  	    _("configure extlinux bootloader (from syslinux)") },
  	{ "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
-Line 3999 
 int main(int argc, const char ** argv) {
+Line 4187 
 int main(int argc, const char ** argv) {
  	return 1;
      } else if (configureGrub2) {
  	cfi = &grub2ConfigType;
+ 	if (envPath)
+ 	    cfi->envFile = envPath;
      } else if (configureLilo) {
  	cfi = &liloConfigType;
      } else if (configureGrub) {
-Line 4213 
 int main(int argc, const char ** argv) {
+Line 4403 
 int main(int argc, const char ** argv) {
          char * rootspec;
  	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 (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
-Line 4231 
 int main(int argc, const char ** argv) {
+Line 4424 
 int main(int argc, const char ** argv) {
  	struct singleEntry * entry;
  	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;
-Line 4253 
 int main(int argc, const char ** argv) {
+Line 4449 
 int main(int argc, const char ** argv) {
      } else if (displayDefaultIndex) {
          if (config->defaultImage == -1) return 0;
+ 	if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
+ 		cfi->defaultIsSaved)
+ 	    config->defaultImage = 0;
          printf("%i\n", config->defaultImage);
+         return 0;
      } else if (kernelInfo)
  	return displayInfo(config, kernelInfo, bootPrefix);

 Legend:



Removed from v.2246
 


changed lines


 
Added in v.2257
 Legend:



Removed from v.2246
 


changed lines


 
Added in v.2257
-Removed from v.2246
+Added in v.2257