Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/grubby.c

    Diff of /trunk/grubby/grubby.c

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2255 by niro, Mon Oct 21 14:00:38 2013 UTC revision 2262 by niro, Mon Oct 21 14:06:22 2013 UTC
    # Line 182  const char *grubFindConfig(struct config Line 182  const char *grubFindConfig(struct config
    182   "/boot/grub/grub.conf",   "/boot/grub/grub.conf",
    183   "/boot/grub/menu.lst",   "/boot/grub/menu.lst",
    184   "/etc/grub.conf",   "/etc/grub.conf",
    185     "/boot/grub2/grub.cfg",
    186     "/boot/grub2-efi/grub.cfg",
    187   NULL   NULL
    188      };      };
    189      static int i = -1;      static int i = -1;
    # Line 297  out: Line 299  out:
    299      return ret;      return ret;
    300  }  }
    301    
    302    static int sPopCount(const char *s, const char *c)
    303    {
    304        int ret = 0;
    305        if (!s)
    306     return -1;
    307        for (int i = 0; s[i] != '\0'; i++)
    308     for (int j = 0; c[j] != '\0'; j++)
    309        if (s[i] == c[j])
    310     ret++;
    311        return ret;
    312    }
    313    
    314    static char *shellEscape(const char *s)
    315    {
    316        int l = strlen(s) + sPopCount(s, "'") * 2;
    317    
    318        char *ret = calloc(l+1, sizeof (*ret));
    319        if (!ret)
    320     return NULL;
    321        for (int i = 0, j = 0; s[i] != '\0'; i++, j++) {
    322     if (s[i] == '\'')
    323        ret[j++] = '\\';
    324     ret[j] = s[i];
    325        }
    326        return ret;
    327    }
    328    
    329    static void unquote(char *s)
    330    {
    331        int l = strlen(s);
    332    
    333        if ((s[l-1] == '\'' && s[0] == '\'') || (s[l-1] == '"' && s[0] == '"')) {
    334     memmove(s, s+1, l-2);
    335     s[l-2] = '\0';
    336        }
    337    }
    338    
    339  static int grub2SetEnv(struct configFileInfo *info, char *name, char *value)  static int grub2SetEnv(struct configFileInfo *info, char *name, char *value)
    340  {  {
    341      char *s = NULL;      char *s = NULL;
    342      int rc = 0;      int rc = 0;
    343      char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";      char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";
    344    
    345        unquote(value);
    346        value = shellEscape(value);
    347        if (!value)
    348        return -1;
    349    
    350      rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value);      rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value);
    351        free(value);
    352      if (rc <0)      if (rc <0)
    353   return -1;   return -1;
    354    
    # Line 1023  static int getNextLine(char ** bufPtr, s Line 1068  static int getNextLine(char ** bufPtr, s
    1068      return 0;      return 0;
    1069  }  }
    1070    
    1071    static int isnumber(const char *s)
    1072    {
    1073        int i;
    1074        for (i = 0; s[i] != '\0'; i++)
    1075     if (s[i] < '0' || s[i] > '9')
    1076        return 0;
    1077        return i;
    1078    }
    1079    
    1080  static struct grubConfig * readConfig(const char * inName,  static struct grubConfig * readConfig(const char * inName,
    1081        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
    1082      int in;      int in;
    # Line 1319  static struct grubConfig * readConfig(co Line 1373  static struct grubConfig * readConfig(co
    1373      char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");      char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
    1374      if (defTitle) {      if (defTitle) {
    1375   int index = 0;   int index = 0;
    1376   entry = findEntryByTitle(cfg, defTitle, &index);   if (isnumber(defTitle)) {
    1377        index = atoi(defTitle);
    1378        entry = findEntryByIndex(cfg, index);
    1379     } else {
    1380        entry = findEntryByTitle(cfg, defTitle, &index);
    1381     }
    1382   if (entry)   if (entry)
    1383      cfg->defaultImage = index;      cfg->defaultImage = index;
    1384      }      }
    # Line 1368  static struct grubConfig * readConfig(co Line 1427  static struct grubConfig * readConfig(co
    1427   char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");   char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
    1428   if (defTitle) {   if (defTitle) {
    1429      int index = 0;      int index = 0;
    1430      entry = findEntryByTitle(cfg, defTitle, &index);      if (isnumber(defTitle)) {
    1431     index = atoi(defTitle);
    1432     entry = findEntryByIndex(cfg, index);
    1433        } else {
    1434     entry = findEntryByTitle(cfg, defTitle, &index);
    1435        }
    1436      if (entry)      if (entry)
    1437   cfg->defaultImage = index;   cfg->defaultImage = index;
    1438   }   }
    # Line 2019  struct singleEntry * findTemplate(struct Line 2083  struct singleEntry * findTemplate(struct
    2083      char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry");      char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry");
    2084      if (defTitle) {      if (defTitle) {
    2085   int index = 0;   int index = 0;
    2086   entry = findEntryByTitle(cfg, defTitle, &index);   if (isnumber(defTitle)) {
    2087        index = atoi(defTitle);
    2088        entry = findEntryByIndex(cfg, index);
    2089     } else {
    2090        entry = findEntryByTitle(cfg, defTitle, &index);
    2091     }
    2092     if (entry)
    2093        cfg->defaultImage = index;
    2094      }      }
    2095   }   }
    2096      } else if (cfg->defaultImage > -1) {      } else if (cfg->defaultImage > -1) {
    Legend:
    Removed from v.2255  
    changed lines
      Added in v.2262