search for: path_add

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.

...directive is separated by a space, e.g. + * + * PATH /bar /bin/foo /baz/bar/bin + */ +static int parse_path(char *p) +{ + struct path_entry *entry; + const char *str; + + while (*p) { + /* Find the next directory */ + str = refdup_word(&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")) {...

...directive is separated by a space, e.g. + * + * PATH /bar /bin/foo /baz/bar/bin + */ +static int parse_path(char *p) +{ + struct path_entry *entry; + const char *str; + + while (*p) { + /* Find the next directory */ + str = refdup_word(&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")) {...

...e (*c && *c != ':') + while (*c && !my_isspace(*c)) c++; str = refstrndup(p, c - p); commit 647e30a1d12ec8a71551910e06e1d16fca27851e Author: Philip Pokorny <ppokorny at penguincomputing.com> Date: Sun Mar 5 20:59:05 2017 -0800 Change path_add so that it adds new entries at the end not the beginning of the list. This fixes an issue where PATH with multiple directories listed would effectively reverse the order of the searched directories diff --git a/core/path.c b/core/path.c index 8e517ca..7b4d886 100644 --- a/core/path.c...

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)

...in/foo /baz/bar/bin > + */ > +static int parse_path(char *p) > +{ > + struct path_entry *entry; > + const char *str; > + > + while (*p) { > + /* Find the next directory */ > + str = refdup_word(&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, c...

...;:') + while (*c && !my_isspace(*c)) c++; str = refstrndup(p, c - p); Speaking of which, why does the code in elflink/ldlinux use "my_isspace" while the rest of SYSLINUX uses isspace()? And why is there not_whitespace() in core/include/fs.h? Next, path_add() adds new entries at the beginning of the list not the end. This causes directories to be search last first not first to last. This should fix that. diff --git a/core/path.c b/core/path.c --- a/core/path.c +++ b/core/path.c @@ -32,7 +32,7 @@ __export struct path_entry *path_add(const char *str)...

On Wed, Oct 07, 2015 at 05:58:51PM -0500, Clements, James wrote: > James Clement > > Geert Stappers > > > On Wed, Oct 07, 2015 at 05:06:41PM -0500, Clements, James wrote: > > > > The screen displays the following: > > > > > > > > PXE Network Boot using IPv4 > > > > .... > > > > Station IP address is 192.168.205.50