ldlinux: fix INCLUDE regression
authorMatt Fleming <matt.fleming@intel.com>
Thu, 27 Jun 2013 11:54:15 +0000 (12:54 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Thu, 27 Jun 2013 12:03:30 +0000 (13:03 +0100)
commit00d0f3add99de6d9c83ff2492bac175a5e1b8a11
tree147e50d4bded12ed4b1673907867002073af9ad5
parent398cee85e1835b77e1b83a01fc20587bee8cc578
ldlinux: fix INCLUDE regression

We don't want to overwrite 'ConfigName' when parsing a config file via
the INCLUDE directive, which commit 5447ef821 ("ldlinux: Always update
ConfigName when opening a config file") failed to take into account. In
the INCLUDE case we're only parsing config fragments, and not a main
config file.

Rename parse_one_config() to parse_main_config() to more accurately
reflect when it should be invoked (i.e. not for INCLUDE).

Signed-off-by: Matt Fleming <matt.fleming@intel.com>
com32/elflink/ldlinux/readconfig.c