diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-06-17 11:57:29 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-06-17 11:57:29 +0100 |
commit | a0bb1928c8652aada30243089c53754ddd9b99df (patch) | |
tree | 5fd177bf495f80b51d323a7d7ebf76e8650e65c4 /com32/lib/sys/module/common.c | |
parent | 97bff28959e9deed6b78dd7df974797476683006 (diff) | |
parent | 022cdd1d56512e8759e8374c10a7420201db93c0 (diff) | |
download | syslinux-a0bb1928c8652aada30243089c53754ddd9b99df.tar.gz |
Merge tag 'syslinux-5.11-pre2' into firmware
syslinux-5.11-pre2
Conflicts:
core/elflink/load_env32.c
version
Diffstat (limited to 'com32/lib/sys/module/common.c')
-rw-r--r-- | com32/lib/sys/module/common.c | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/com32/lib/sys/module/common.c b/com32/lib/sys/module/common.c index 4c83789e..a589f24f 100644 --- a/com32/lib/sys/module/common.c +++ b/com32/lib/sys/module/common.c @@ -59,40 +59,28 @@ void print_elf_symbols(struct elf_module *module) { FILE *findpath(char *name) { + struct path_entry *entry; char path[FILENAME_MAX]; FILE *f; - char *p, *n; - int i; f = fopen(name, "rb"); /* for full path */ if (f) return f; - p = PATH; -again: - i = 0; - while (*p && *p != ':' && i < FILENAME_MAX - 1) { - path[i++] = *p++; - } - - if (*p == ':') - p++; + list_for_each_entry(entry, &PATH, list) { + bool slash = false; - /* Ensure we have a '/' separator */ - if (path[i] != '/' && i < FILENAME_MAX - 1) - path[i++] = '/'; + /* Ensure we have a '/' separator */ + if (entry->str[strlen(entry->str) - 1] != '/') + slash = true; - n = name; - while (*n && i < FILENAME_MAX - 1) - path[i++] = *n++; - path[i] = '\0'; + snprintf(path, sizeof(path), "%s%s%s", + entry->str, slash ? "/" : "", name); - f = fopen(path, "rb"); - if (f) - return f; - - if (p >= PATH && p < PATH + strlen(PATH)) - goto again; + f = fopen(path, "rb"); + if (f) + return f; + } return NULL; } |