search for: do_include

...s, "label")) { menu_ptr->menu_label = strdup(t); u = strlen(t); - if(u > label_size) label_size = u; + if(u > gfx_menu.label_size) gfx_menu.label_size = u; continue; } + + if(!strcasecmp(s, "include")) { + goto do_include; + } + } + + if (!strcasecmp(s, "include")) { +do_include: + s = t; + t = skip_nonspaces(s); + if (*t) *t = 0; + read_config_file(s); } } fclose(f); + if (!top_level) + return 0; + // final '\0' - label_size++; - append_size++...

...*menu_list, *default_menu; int shiftkey = 0; /* Only display menu if shift key pressed */ int hiddenmenu = 0; long long totaltimeout = 0; +unsigned int kbdtimeout = 0; /* Keep track of global default */ static int has_ui = 0; /* DEFAULT only counts if UI is found */ @@ -1081,13 +1083,14 @@ do_include: //dprintf("got a kernel: %s, type = %d", ld.kernel, ld.type); } } else if (looking_at(p, "timeout")) { - m->timeout = (atoi(skipspace(p + 7)) * CLK_TCK + 9) / 10; + kbdtimeout = (atoi(skipspace(p + 7)) * CLK_TCK + 9) / 10; } else if (looking_at(p, "...

...e_config_file(FILE * f) } } else if (looking_at(p, "hide")) { ld.menuhide = 1; + } else if (looking_at(p, "commit")) { + ld.menucommit = 1; } else if (looking_at(p, "passwd")) { if (ld.label) { refstr_put(ld.passwd); @@ -931,7 +935,7 @@ do_include: ld.helptext = NULL; ld.ipappend = ipappend; ld.menudefault = ld.menuhide = ld.menuseparator = - ld.menudisabled = ld.menuindent = 0; + ld.menudisabled = ld.menuindent = ld.menucommit = 0; } else if ((ep = is_kernel_type(p, &type))) { if (ld.label) { refstr_put(ld...

...1); if (!dst) { printf("Failed to allocate memory for ADV\n"); diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c index 4f7a4d2..70fe346 100644 --- a/com32/elflink/ldlinux/readconfig.c +++ b/com32/elflink/ldlinux/readconfig.c @@ -1121,7 +1121,8 @@ do_include: * display/font/kbdmap are rather similar, open a file then do sth */ else if (looking_at(p, "display")) { - char *filename, *dst = KernelName; + const char *filename; + char *dst = KernelName; size_t len = FILENAME_MAX - 1; filename = refstrdup(skipspace(p + 7)); @@ -1...

...booting from CD unknown => hide + break; + default: + m = hide_menu; + break; + } + } + if (ld->label) { char ipoptions[4096], *ipp; const char *a; @@ -744,9 +774,14 @@ static void parse_config_file(FILE * f) } else if ((ep = looking_at(p, "include"))) { goto do_include; } else if ((ep = looking_at(p, "background"))) { - p = skipspace(ep); - refstr_put(m->menu_background); - m->menu_background = refdup_word(&p); + p = skipspace(ep); + refstr_put(m->menu_background); + m->menu_background = refdup_word(&p); + } else if ((ep...

On Wed, 12 Jun, at 11:17:44AM, Gerardo Exequiel Pozzi wrote: > Cool thanks!. Now looks better, but still not work. > > For some reason, "ldlinux.c32" is apparently sent but "Failed to load" > by PXELINUX and few seconds later, dnsmasq shows an error message > "failed sending": Argh! The patch was broken. I missed the new core/path.c file. My bad.

...(&p); + if (!str) + goto bail; + + entry = path_add(str); + refstr_put(str); + + if (!entry) + goto bail; + + p = skipspace(p); + } + + return 0; + +bail: + return -1; +} + static void parse_config_file(FILE * f) { char line[MAX_LINE], *p, *ep, ch; @@ -1337,24 +1370,8 @@ do_include: } else if (looking_at(p, "say")) { printf("%s\n", p+4); } else if (looking_at(p, "path")) { - /* PATH-based lookup */ - const char *new_path; - char *_p; - size_t len, new_len; - - new_path = refstrdup(skipspace(p + 4)); - len = strlen(PATH); - new_len =...

Hi, These patches contain support for some features that are already in Syslinux 4 but weren't working properly on the elflink branch. It's another step closer to feature parity with Syslinux 4. Having to jump through the comboot API for localboot support is less than ideal and I'll eventually fix that, probably when we move a big chunk of code from asm to C. Also, there's a

...(&p); + if (!str) + goto bail; + + entry = path_add(str); + refstr_put(str); + + if (!entry) + goto bail; + + p = skipspace(p); + } + + return 0; + +bail: + return -1; +} + static void parse_config_file(FILE * f) { char line[MAX_LINE], *p, *ep, ch; @@ -1337,24 +1370,8 @@ do_include: } else if (looking_at(p, "say")) { printf("%s\n", p+4); } else if (looking_at(p, "path")) { - /* PATH-based lookup */ - const char *new_path; - char *_p; - size_t len, new_len; - - new_path = refstrdup(skipspace(p + 4)); - len = strlen(PATH); - new_len =...

On Mon, 10 Jun, at 07:57:50AM, H. Peter Anvin wrote: > Either that or make the path a list rather than a string, using the > normal word separators when entered on the command line, a bit like the > (t)csh does. That is a bigger change but is probably a better solution. How would this solution handle filenames containing spaces? Would we need to escape (presumably with a backslash)

...> + > + if (!entry) > + goto bail; > + > + p = skipspace(p); > + } > + > + return 0; > + > +bail: > + return -1; > +} > + > static void parse_config_file(FILE * f) > { > char line[MAX_LINE], *p, *ep, ch; > @@ -1337,24 +1370,8 @@ do_include: > } else if (looking_at(p, "say")) { > printf("%s\n", p+4); > } else if (looking_at(p, "path")) { > - /* PATH-based lookup */ > - const char *new_path; > - char *_p; > - size_t len, new_len; > - > - new_path = refstrdup(skipspace...

...uint32_t parse_argb(char **p) * same way as if the files had been concatenated together. */ //static const char *append = NULL; -extern char *append; +extern const char *append; //static unsigned int ipappend = 0; unsigned int ipappend = 0; static struct labeldata ld; @@ -1056,7 +1056,6 @@ do_include: static int parse_one_config(const char *filename) { FILE *f; - int i; /* if (!strcmp(filename, "~")) @@ -1107,24 +1106,11 @@ static void resolve_gotos(void) } } -static void dump_menu(struct menu *menu) -{ - dprintf("will dump menu for %s:", menu->label); -...

From: Matt Fleming <matt.fleming at linux.intel.com> This is a series of patches that, * shrink the core by moving things into an ldlinux ELF module * begin wiring up some of the C versions of various functions The core now only contains essential code and loads the ldlinux module to do everything else, like providing a command line interface and loading kernels. The config file parsing

...gt; #include <syslinux/config.h> #include "menu.h" +/* BLS entry global settings */ +#define BLS_CHUNK 16 +int bls_version_places = 3; +char *bls_sort_by = "machine-id version title"; + /* Empty refstring */ const char *empty_string; @@ -1060,6 +1066,337 @@ do_include: } } +/* + * https://systemd.io/BOOT_LOADER_SPECIFICATION + * #type-1-boot-loader-specification-entries + */ +struct blsdata { + const char *title; + const char *version; + char *version0; /* version string padded with zeros */ + const char *machine_id; + const char *linux_;...

...ar *empty_string; @@ -597,6 +609,7 @@ static unsigned int ipappend = 0; static struct labeldata ld; static int parse_one_config(const char *filename); +static int parse_bls1_dir(const char *dirname); static char *is_kernel_type(char *cmdstr, enum kernel_type *type) { @@ -1057,7 +1070,312 @@ do_include: } else if (looking_at(p, "ui")) { has_ui = 1; } + + else if (looking_at(p, "bls1")) { + p = skipspace(p + 4); + if (looking_at(p, "include")) { + p = skipspace(p + 7); + parse_bls1_dir((*p) ? p : BLS1_DIR); + } else if (looking_at(p, "labe...

From: Matt Fleming <matt.fleming at intel.com> The following patch series is available at, git://git.zytor.com/users/mfleming/syslinux.git elflink All patches are against the 'elflink' branch. This series fixes a few serious bugs and some behavioural incompatibilities with the 4.x series. Matt Fleming (19): ldlinux: Initialise 'p' before using it. ldlinux: Parse