search for: parse_one_config

...it's also possible to specify more than one file. menu.txt got "If you specify more than one file, they will all be read, in the order specified." What is the desired failure mode if one of those files doesn't exist? com32/menu/menumain.c calls parse_configs() which itself calls parse_one_config (readconfig.c). parse_one_config() returns -1 if the specified config file is not available, but the return code is not checked in parse_configs(). The current failure mode is therefore "ignore". If this is by design it might be worth mentioning it in menu.txt. If no config file is found...

...to explain? Or could IMAGE_TYPE_CONFIG set the directory before processing the config file. Both menu.c32 and ldlinux.EXT have parse_configs() functions that they send the argc/argv list they receive. Both functions handle multiple arguments as multiple config files to be processed (with either parse_one_config() or parse_main_config()). The documentation (http://www.syslinux.org/wiki/index.php?title=Menu#Alternative_configuration_file) shows examples of this for the menu.c32 case. But this highlights that we have two different config file parsers with different behavior. I haven't looked closely t...

From: Matt Fleming <matt.fleming at intel.com> Here are the patches that I've got queued up based on the very helpful feedback I received from people testing Syslinux 5.00-pre9. Unless anyone has any concerns these will make it into Syslinux 5.00-pre10. Matt Fleming (9): pxe: Don't call open_config() from the pxe core ldlinux: Print a warning if no config file is found

...oto cmdline; + } + /* TODO: Check KbdFlags? */ if (forceprompt) diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c index 441651e..8ded92a 100644 --- a/com32/elflink/ldlinux/readconfig.c +++ b/com32/elflink/ldlinux/readconfig.c @@ -1154,7 +1154,7 @@ static int parse_one_config(const char *filename) if (f) goto config_found; - f = fopen("isolinux.cfg", "r"); + f = fopen("isolinux/isolinux.cfg", "r"); if (f) goto config_found; diff --git a/com32/lib/syslinux/setadv.c b/com32/elflink/ldlinux/setadv.c similarity index 100...

...X or in ISOLINUX, I hope someone else will step up for testing. > > Both menu.c32 and ldlinux.EXT have parse_configs() functions that they > send the argc/argv list they receive. Both functions handle multiple > arguments as multiple config files to be processed (with either > parse_one_config() or parse_main_config()). The documentation > (http://www.syslinux.org/wiki/index.php?title=Menu#Alternative_configuration_file) > shows examples of this for the menu.c32 case. > > But this highlights that we have two different config file parsers > with different behavior. I hav...

...d learn, is proper handling the feedback from tests. > > Both menu.c32 and ldlinux.EXT have parse_configs() functions that they > > send the argc/argv list they receive. Both functions handle multiple > > arguments as multiple config files to be processed (with either > > parse_one_config() or parse_main_config()). The documentation > > (http://www.syslinux.org/wiki/index.php?title=Menu#Alternative_configuration_file) > > shows examples of this for the menu.c32 case. > > > > But this highlights that we have two different config file parsers > > with d...

...em: + dprintf("Out of memory error!\n"); + free(filename); + for (i = 0; i < n_bd; i++) { + clear_bls_data(bdx[i]); + free(bdx[i]); + } + free(bdx); + clear_bls_data(nbd); + free(nbd); + if (d) + closedir(d); + return -1; +} + static int parse_one_config(const char *filename) { FILE *f; @@ -1067,6 +1404,9 @@ static int parse_one_config(const char *filename) if (!strcmp(filename, "~")) filename = syslinux_config_file(); + if (!strncmp(filename, "bls1:", 5) || !strncmp(filename, "BLS1:", 5)) + re...

...+char *bls1_pinmin = NULL; +char *bls1_pinmax = NULL; +int bls1_padver = BLS1_PADVER; +int bls1_ascend = BLS1_ASCEND; +int bls1_shwlbl = BLS1_SHWLBL; /* Empty refstring */ const char *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")) { +...

...r **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); - printf("entries num: %d\...

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

...more than one file. menu.txt got > "If you specify more than one file, they will all be read, in the order > specified." > > What is the desired failure mode if one of those files doesn't exist? > > com32/menu/menumain.c calls parse_configs() which itself calls > parse_one_config (readconfig.c). > parse_one_config() returns -1 if the specified config file is not > available, but the return code is not > checked in parse_configs(). The current failure mode is therefore "ignore". > If this is by design it might > be worth mentioning it in menu.txt. &g...

...,7 +1310,8 @@ do_include: eprintf("%s\n", p+4); } else if (looking_at(p, "path")) { /* PATH-based lookup */ - char *new_path, *_p; + const char *new_path; + char *_p; size_t len, new_len; new_path = refstrdup(skipspace(p + 4)); @@ -1348,7 +1350,7 @@ static int parse_one_config(const char *filename) if (config_cwd[0]) { chdir(config_cwd); - config_cwd[0] = NULL; + config_cwd[0] = '\0'; } return 0; diff --git a/com32/hdt/hdt-common.h b/com32/hdt/hdt-common.h index d37fcc8..fec213d 100644 --- a/com32/hdt/hdt-common.h +++ b/com32/hdt/hdt-common.h @@ -5...

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