243 |
} |
} |
244 |
|
|
245 |
int sizeOfSingleLine(struct singleLine * line) { |
int sizeOfSingleLine(struct singleLine * line) { |
|
int i; |
|
246 |
int count = 0; |
int count = 0; |
247 |
|
|
248 |
for (i = 0; i < line->numElements; i++) { |
for (int i = 0; i < line->numElements; i++) { |
249 |
int indentSize = 0; |
int indentSize = 0; |
250 |
|
|
251 |
count = count + strlen(line->elements[i].item); |
count = count + strlen(line->elements[i].item); |
572 |
|
|
573 |
static struct keywordTypes * getKeywordByType(enum lineType_e type, |
static struct keywordTypes * getKeywordByType(enum lineType_e type, |
574 |
struct configFileInfo * cfi) { |
struct configFileInfo * cfi) { |
575 |
struct keywordTypes * kw; |
for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) { |
|
for (kw = cfi->keywords; kw->key; kw++) { |
|
576 |
if (kw->type == type) |
if (kw->type == type) |
577 |
return kw; |
return kw; |
578 |
} |
} |
602 |
|
|
603 |
static enum lineType_e getTypeByKeyword(char * keyword, |
static enum lineType_e getTypeByKeyword(char * keyword, |
604 |
struct configFileInfo * cfi) { |
struct configFileInfo * cfi) { |
605 |
struct keywordTypes * kw; |
for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) { |
|
for (kw = cfi->keywords; kw->key; kw++) { |
|
606 |
if (!strcmp(keyword, kw->key)) |
if (!strcmp(keyword, kw->key)) |
607 |
return kw->type; |
return kw->type; |
608 |
} |
} |
689 |
} |
} |
690 |
|
|
691 |
struct singleLine * lineDup(struct singleLine * line) { |
struct singleLine * lineDup(struct singleLine * line) { |
|
int i; |
|
692 |
struct singleLine * newLine = malloc(sizeof(*newLine)); |
struct singleLine * newLine = malloc(sizeof(*newLine)); |
693 |
|
|
694 |
newLine->indent = strdup(line->indent); |
newLine->indent = strdup(line->indent); |
698 |
newLine->elements = malloc(sizeof(*newLine->elements) * |
newLine->elements = malloc(sizeof(*newLine->elements) * |
699 |
newLine->numElements); |
newLine->numElements); |
700 |
|
|
701 |
for (i = 0; i < newLine->numElements; i++) { |
for (int i = 0; i < newLine->numElements; i++) { |
702 |
newLine->elements[i].indent = strdup(line->elements[i].indent); |
newLine->elements[i].indent = strdup(line->elements[i].indent); |
703 |
newLine->elements[i].item = strdup(line->elements[i].item); |
newLine->elements[i].item = strdup(line->elements[i].item); |
704 |
} |
} |
707 |
} |
} |
708 |
|
|
709 |
static void lineFree(struct singleLine * line) { |
static void lineFree(struct singleLine * line) { |
|
int i; |
|
|
|
|
710 |
if (line->indent) free(line->indent); |
if (line->indent) free(line->indent); |
711 |
|
|
712 |
for (i = 0; i < line->numElements; i++) { |
for (int i = 0; i < line->numElements; i++) { |
713 |
free(line->elements[i].item); |
free(line->elements[i].item); |
714 |
free(line->elements[i].indent); |
free(line->elements[i].indent); |
715 |
} |
} |
720 |
|
|
721 |
static int lineWrite(FILE * out, struct singleLine * line, |
static int lineWrite(FILE * out, struct singleLine * line, |
722 |
struct configFileInfo * cfi) { |
struct configFileInfo * cfi) { |
|
int i; |
|
|
|
|
723 |
if (fprintf(out, "%s", line->indent) == -1) return -1; |
if (fprintf(out, "%s", line->indent) == -1) return -1; |
724 |
|
|
725 |
for (i = 0; i < line->numElements; i++) { |
for (int i = 0; i < line->numElements; i++) { |
726 |
/* Need to handle this, because we strip the quotes from |
/* Need to handle this, because we strip the quotes from |
727 |
* menuentry when read it. */ |
* menuentry when read it. */ |
728 |
if (line->type == LT_MENUENTRY && i == 1) { |
if (line->type == LT_MENUENTRY && i == 1) { |
828 |
if (*line->elements[0].item == '#') { |
if (*line->elements[0].item == '#') { |
829 |
char * fullLine; |
char * fullLine; |
830 |
int len; |
int len; |
|
int i; |
|
831 |
|
|
832 |
len = strlen(line->indent); |
len = strlen(line->indent); |
833 |
for (i = 0; i < line->numElements; i++) |
for (int i = 0; i < line->numElements; i++) |
834 |
len += strlen(line->elements[i].item) + |
len += strlen(line->elements[i].item) + |
835 |
strlen(line->elements[i].indent); |
strlen(line->elements[i].indent); |
836 |
|
|
839 |
free(line->indent); |
free(line->indent); |
840 |
line->indent = fullLine; |
line->indent = fullLine; |
841 |
|
|
842 |
for (i = 0; i < line->numElements; i++) { |
for (int i = 0; i < line->numElements; i++) { |
843 |
strcat(fullLine, line->elements[i].item); |
strcat(fullLine, line->elements[i].item); |
844 |
strcat(fullLine, line->elements[i].indent); |
strcat(fullLine, line->elements[i].indent); |
845 |
free(line->elements[i].item); |
free(line->elements[i].item); |
858 |
* elements up more |
* elements up more |
859 |
*/ |
*/ |
860 |
if (!isspace(kw->separatorChar)) { |
if (!isspace(kw->separatorChar)) { |
|
int i; |
|
861 |
char indent[2] = ""; |
char indent[2] = ""; |
862 |
indent[0] = kw->separatorChar; |
indent[0] = kw->separatorChar; |
863 |
for (i = 1; i < line->numElements; i++) { |
for (int i = 1; i < line->numElements; i++) { |
864 |
char *p; |
char *p; |
|
int j; |
|
865 |
int numNewElements; |
int numNewElements; |
866 |
|
|
867 |
numNewElements = 0; |
numNewElements = 0; |
877 |
sizeof(*line->elements) * elementsAlloced); |
sizeof(*line->elements) * elementsAlloced); |
878 |
} |
} |
879 |
|
|
880 |
for (j = line->numElements; j > i; j--) { |
for (int j = line->numElements; j > i; j--) { |
881 |
line->elements[j + numNewElements] = line->elements[j]; |
line->elements[j + numNewElements] = line->elements[j]; |
882 |
} |
} |
883 |
line->numElements += numNewElements; |
line->numElements += numNewElements; |
890 |
break; |
break; |
891 |
} |
} |
892 |
|
|
893 |
free(line->elements[i].indent); |
line->elements[i + 1].indent = line->elements[i].indent; |
894 |
line->elements[i].indent = strdup(indent); |
line->elements[i].indent = strdup(indent); |
895 |
*p++ = '\0'; |
*p++ = '\0'; |
896 |
i++; |
i++; |
897 |
line->elements[i].item = strdup(p); |
line->elements[i].item = strdup(p); |
|
line->elements[i].indent = strdup(""); |
|
|
p = line->elements[i].item; |
|
898 |
} |
} |
899 |
} |
} |
900 |
} |
} |
915 |
struct singleLine * last = NULL, * line, * defaultLine = NULL; |
struct singleLine * last = NULL, * line, * defaultLine = NULL; |
916 |
char * end; |
char * end; |
917 |
struct singleEntry * entry = NULL; |
struct singleEntry * entry = NULL; |
918 |
int i, len; |
int len; |
919 |
char * buf; |
char * buf; |
920 |
|
|
921 |
if (!strcmp(inName, "-")) { |
if (!strcmp(inName, "-")) { |
978 |
} |
} |
979 |
|
|
980 |
if (line->type == LT_SET_VARIABLE) { |
if (line->type == LT_SET_VARIABLE) { |
|
int i; |
|
981 |
dbgPrintf("found 'set' command (%d elements): ", line->numElements); |
dbgPrintf("found 'set' command (%d elements): ", line->numElements); |
982 |
dbgPrintf("%s", line->indent); |
dbgPrintf("%s", line->indent); |
983 |
for (i = 0; i < line->numElements; i++) |
for (int i = 0; i < line->numElements; i++) |
984 |
dbgPrintf("%s\"%s\"", line->elements[i].indent, line->elements[i].item); |
dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent); |
985 |
dbgPrintf("\n"); |
dbgPrintf("\n"); |
986 |
struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi); |
struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi); |
987 |
if (kwType && line->numElements == 3 && |
if (kwType && line->numElements == 3 && |
1008 |
* This only applies to grub, but that's the only place we |
* This only applies to grub, but that's the only place we |
1009 |
* should find LT_MBMODULE lines anyway. |
* should find LT_MBMODULE lines anyway. |
1010 |
*/ |
*/ |
1011 |
struct singleLine * l; |
for (struct singleLine *l = entry->lines; l; l = l->next) { |
|
for (l = entry->lines; l; l = l->next) { |
|
1012 |
if (l->type == LT_HYPER) |
if (l->type == LT_HYPER) |
1013 |
break; |
break; |
1014 |
else if (l->type == LT_KERNEL) { |
else if (l->type == LT_KERNEL) { |
1028 |
} else if (line->type == LT_TITLE && line->numElements > 1) { |
} else if (line->type == LT_TITLE && line->numElements > 1) { |
1029 |
/* make the title a single argument (undoing our parsing) */ |
/* make the title a single argument (undoing our parsing) */ |
1030 |
len = 0; |
len = 0; |
1031 |
for (i = 1; i < line->numElements; i++) { |
for (int i = 1; i < line->numElements; i++) { |
1032 |
len += strlen(line->elements[i].item); |
len += strlen(line->elements[i].item); |
1033 |
len += strlen(line->elements[i].indent); |
len += strlen(line->elements[i].indent); |
1034 |
} |
} |
1035 |
buf = malloc(len + 1); |
buf = malloc(len + 1); |
1036 |
*buf = '\0'; |
*buf = '\0'; |
1037 |
|
|
1038 |
for (i = 1; i < line->numElements; i++) { |
for (int i = 1; i < line->numElements; i++) { |
1039 |
strcat(buf, line->elements[i].item); |
strcat(buf, line->elements[i].item); |
1040 |
free(line->elements[i].item); |
free(line->elements[i].item); |
1041 |
|
|
1055 |
char *extras; |
char *extras; |
1056 |
char *title; |
char *title; |
1057 |
|
|
1058 |
for (i = 1; i < line->numElements; i++) { |
for (int i = 1; i < line->numElements; i++) { |
1059 |
len += strlen(line->elements[i].item); |
len += strlen(line->elements[i].item); |
1060 |
len += strlen(line->elements[i].indent); |
len += strlen(line->elements[i].indent); |
1061 |
} |
} |
1067 |
*extras = '\0'; |
*extras = '\0'; |
1068 |
|
|
1069 |
/* get title. */ |
/* get title. */ |
1070 |
for (i = 0; i < line->numElements; i++) { |
for (int i = 0; i < line->numElements; i++) { |
1071 |
if (!strcmp(line->elements[i].item, "menuentry")) |
if (!strcmp(line->elements[i].item, "menuentry")) |
1072 |
continue; |
continue; |
1073 |
if (isquote(*line->elements[i].item)) |
if (isquote(*line->elements[i].item)) |
1087 |
|
|
1088 |
/* get extras */ |
/* get extras */ |
1089 |
int count = 0; |
int count = 0; |
1090 |
for (i = 0; i < line->numElements; i++) { |
for (int i = 0; i < line->numElements; i++) { |
1091 |
if (count == 2) { |
if (count >= 2) { |
1092 |
strcat(extras, line->elements[i].item); |
strcat(extras, line->elements[i].item); |
1093 |
strcat(extras, line->elements[i].indent); |
strcat(extras, line->elements[i].indent); |
1094 |
} |
} |
1208 |
cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10); |
cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10); |
1209 |
if (*end) cfg->defaultImage = -1; |
if (*end) cfg->defaultImage = -1; |
1210 |
} else if (defaultLine->numElements >= 2) { |
} else if (defaultLine->numElements >= 2) { |
1211 |
i = 0; |
int i = 0; |
1212 |
while ((entry = findEntryByIndex(cfg, i))) { |
while ((entry = findEntryByIndex(cfg, i))) { |
1213 |
for (line = entry->lines; line; line = line->next) |
for (line = entry->lines; line; line = line->next) |
1214 |
if (line->type == LT_TITLE) break; |
if (line->type == LT_TITLE) break; |
1310 |
|
|
1311 |
/* most likely the symlink is relative, so change our |
/* most likely the symlink is relative, so change our |
1312 |
directory to the dir of the symlink */ |
directory to the dir of the symlink */ |
1313 |
rc = chdir(dirname(strdupa(outName))); |
rc = chdir(dirname(outName)); |
1314 |
do { |
do { |
1315 |
buf = alloca(len + 1); |
buf = alloca(len + 1); |
1316 |
rc = readlink(basename(outName), buf, len); |
rc = readlink(basename(outName), buf, len); |
1448 |
buf[rc] = '\0'; |
buf[rc] = '\0'; |
1449 |
chptr = buf; |
chptr = buf; |
1450 |
|
|
1451 |
|
char *foundanswer = NULL; |
1452 |
|
|
1453 |
while (chptr && chptr != buf+rc) { |
while (chptr && chptr != buf+rc) { |
1454 |
devname = chptr; |
devname = chptr; |
1455 |
|
|
1477 |
* for '/' obviously. |
* for '/' obviously. |
1478 |
*/ |
*/ |
1479 |
if (*(++chptr) == '/' && *(++chptr) == ' ') { |
if (*(++chptr) == '/' && *(++chptr) == ' ') { |
1480 |
/* |
/* remember the last / entry in mtab */ |
1481 |
* Move back 2, which is the first space after the device name, set |
foundanswer = devname; |
|
* it to \0 so strdup will just get the devicename. |
|
|
*/ |
|
|
chptr -= 2; |
|
|
*chptr = '\0'; |
|
|
return strdup(devname); |
|
1482 |
} |
} |
1483 |
|
|
1484 |
/* Next line */ |
/* Next line */ |
1487 |
chptr++; |
chptr++; |
1488 |
} |
} |
1489 |
|
|
1490 |
|
/* Return the last / entry found */ |
1491 |
|
if (foundanswer) { |
1492 |
|
chptr = strchr(foundanswer, ' '); |
1493 |
|
*chptr = '\0'; |
1494 |
|
return strdup(foundanswer); |
1495 |
|
} |
1496 |
|
|
1497 |
return NULL; |
return NULL; |
1498 |
} |
} |
1499 |
|
|
2966 |
static char * getInitrdVal(struct grubConfig * config, |
static char * getInitrdVal(struct grubConfig * config, |
2967 |
const char * prefix, struct singleLine *tmplLine, |
const char * prefix, struct singleLine *tmplLine, |
2968 |
const char * newKernelInitrd, |
const char * newKernelInitrd, |
2969 |
char ** extraInitrds, int extraInitrdCount) |
const char ** extraInitrds, int extraInitrdCount) |
2970 |
{ |
{ |
2971 |
char *initrdVal, *end; |
char *initrdVal, *end; |
2972 |
int i; |
int i; |
3011 |
|
|
3012 |
int addNewKernel(struct grubConfig * config, struct singleEntry * template, |
int addNewKernel(struct grubConfig * config, struct singleEntry * template, |
3013 |
const char * prefix, |
const char * prefix, |
3014 |
char * newKernelPath, char * newKernelTitle, |
const char * newKernelPath, const char * newKernelTitle, |
3015 |
char * newKernelArgs, char * newKernelInitrd, |
const char * newKernelArgs, const char * newKernelInitrd, |
3016 |
char ** extraInitrds, int extraInitrdCount, |
const char ** extraInitrds, int extraInitrdCount, |
3017 |
char * newMBKernel, char * newMBKernelArgs) { |
const char * newMBKernel, const char * newMBKernelArgs) { |
3018 |
struct singleEntry * new; |
struct singleEntry * new; |
3019 |
struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL; |
struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL; |
3020 |
int needs; |
int needs; |
3576 |
} |
} |
3577 |
|
|
3578 |
if (!cfi) { |
if (!cfi) { |
3579 |
|
if (grub2FindConfig(&grub2ConfigType)) |
3580 |
|
cfi = &grub2ConfigType; |
3581 |
|
else |
3582 |
#ifdef __ia64__ |
#ifdef __ia64__ |
3583 |
cfi = &eliloConfigType; |
cfi = &eliloConfigType; |
3584 |
#elif __powerpc__ |
#elif __powerpc__ |
3585 |
cfi = &yabootConfigType; |
cfi = &yabootConfigType; |
3586 |
#elif __sparc__ |
#elif __sparc__ |
3587 |
cfi = &siloConfigType; |
cfi = &siloConfigType; |
3588 |
#elif __s390__ |
#elif __s390__ |
3589 |
cfi = &ziplConfigType; |
cfi = &ziplConfigType; |
3590 |
#elif __s390x__ |
#elif __s390x__ |
3591 |
cfi = &ziplConfigtype; |
cfi = &ziplConfigtype; |
3592 |
#else |
#else |
|
if (grub2FindConfig(&grub2ConfigType)) |
|
|
cfi = &grub2ConfigType; |
|
|
else |
|
3593 |
cfi = &grubConfigType; |
cfi = &grubConfigType; |
3594 |
#endif |
#endif |
3595 |
} |
} |
3800 |
} |
} |
3801 |
if (addNewKernel(config, template, bootPrefix, newKernelPath, |
if (addNewKernel(config, template, bootPrefix, newKernelPath, |
3802 |
newKernelTitle, newKernelArgs, newKernelInitrd, |
newKernelTitle, newKernelArgs, newKernelInitrd, |
3803 |
extraInitrds, extraInitrdCount, |
(const char **)extraInitrds, extraInitrdCount, |
3804 |
newMBKernel, newMBKernelArgs)) return 1; |
newMBKernel, newMBKernelArgs)) return 1; |
3805 |
|
|
3806 |
|
|