From 31783203c3b74c11015b20194d57dada559940cf Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 25 May 2012 13:07:01 +0100 Subject: [PATCH] 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 Signed-off-by: Anthony Liguori --- vl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 1329c30e6a..2e140f57c7 100644 --- a/vl.c +++ b/vl.c @@ -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) {