1960 |
} |
} |
1961 |
|
|
1962 |
indexVars[i + 1] = -1; |
indexVars[i + 1] = -1; |
1963 |
|
|
1964 |
i = 0; |
i = 0; |
1965 |
if (index) { |
if (index) { |
1966 |
while (i < *index) i++; |
while (i < *index) { |
1967 |
if (indexVars[i] == -1) return NULL; |
i++; |
1968 |
|
if (indexVars[i] == -1) return NULL; |
1969 |
|
} |
1970 |
} |
} |
1971 |
|
|
1972 |
entry = findEntryByIndex(config, indexVars[i]); |
entry = findEntryByIndex(config, indexVars[i]); |
2120 |
} else { |
} else { |
2121 |
entry = findEntryByTitle(cfg, defTitle, &index); |
entry = findEntryByTitle(cfg, defTitle, &index); |
2122 |
} |
} |
2123 |
if (entry) |
if (entry && suitableImage(entry, prefix, skipRemoved, flags)) { |
2124 |
cfg->defaultImage = index; |
cfg->defaultImage = index; |
2125 |
|
if (indexPtr) |
2126 |
|
*indexPtr = index; |
2127 |
|
return entry; |
2128 |
|
} |
2129 |
} |
} |
2130 |
} |
} |
2131 |
} else if (cfg->defaultImage > -1) { |
} else if (cfg->defaultImage > -1) { |
3316 |
|
|
3317 |
if (!image) return 0; |
if (!image) return 0; |
3318 |
|
|
3319 |
for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) { |
for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) { |
3320 |
kernelLine = getLineByType(LT_MBMODULE, entry->lines); |
kernelLine = getLineByType(LT_MBMODULE, entry->lines); |
3321 |
if (!kernelLine) continue; |
if (!kernelLine) continue; |
3322 |
|
|
4059 |
} |
} |
4060 |
} |
} |
4061 |
|
|
4062 |
|
struct singleLine *endLine = NULL; |
4063 |
|
endLine = getLineByType(LT_ENTRY_END, new->lines); |
4064 |
|
if (endLine) { |
4065 |
|
removeLine(new, endLine); |
4066 |
|
needs |= NEED_END; |
4067 |
|
} |
4068 |
|
|
4069 |
/* add the remainder of the lines, i.e. those that either |
/* add the remainder of the lines, i.e. those that either |
4070 |
* weren't present in the template, or in the case of no template, |
* weren't present in the template, or in the case of no template, |
4071 |
* all the lines following the entryStart. |
* all the lines following the entryStart. |
4124 |
config->secondaryIndent, NULL); |
config->secondaryIndent, NULL); |
4125 |
needs &= ~NEED_END; |
needs &= ~NEED_END; |
4126 |
} |
} |
4127 |
|
|
4128 |
if (needs) { |
if (needs) { |
4129 |
printf(_("grubby: needs=%d, aborting\n"), needs); |
printf(_("grubby: needs=%d, aborting\n"), needs); |
4130 |
abort(); |
abort(); |