diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2012-05-25 13:07:01 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-11 08:51:50 -0500 |
commit | 31783203c3b74c11015b20194d57dada559940cf (patch) | |
tree | 3ca6b3244b3cd62a6172d28e9bb79d897b57ff52 /vl.c | |
parent | 92336855975805d88c7979f53bc05c2d47abab04 (diff) | |
download | qemu-31783203c3b74c11015b20194d57dada559940cf.zip qemu-31783203c3b74c11015b20194d57dada559940cf.tar.gz qemu-31783203c3b74c11015b20194d57dada559940cf.tar.bz2 |
qemu_find_file: check name as a straight path even if it has no '/'
Make qemu_find_file() check for the passed in name as a straight
pathname even if it doesn't have any path separator character in it.
This means that "-bios foo", "-dtb foo" etc will find a file 'foo'
in the current directory.
This removes an inconsistency with -kernel and -initrd, which both
accept plain filenames as meaning files in the current directory.
It's also less confusing for the user than an undocumented restriction
that "this option accepts a filename, except for the special case
where the filename you pass happens not to have a '/' in it, in
which case we'll ignore it."
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1795,9 +1795,8 @@ char *qemu_find_file(int type, const char *name) const char *subdir; char *buf; - /* If name contains path separators then try it as a straight path. */ - if ((strchr(name, '/') || strchr(name, '\\')) - && access(name, R_OK) == 0) { + /* Try the name as a straight path first */ + if (access(name, R_OK) == 0) { return g_strdup(name); } switch (type) { |