diff options
author | Max Kellermann <max@duempel.org> | 2009-12-15 18:59:03 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-12-15 19:16:28 +0100 |
commit | f01d7d230b1835ab035a5130e2a39f05f0aabdf5 (patch) | |
tree | 1dbbaadf8563e20578155cee908a44495b4b449c /src/input/file_input_plugin.c | |
parent | 8f7bc70bf5e47da66e57e5606b978ba3ee975d89 (diff) | |
download | mpd-f01d7d230b1835ab035a5130e2a39f05f0aabdf5.tar.gz mpd-f01d7d230b1835ab035a5130e2a39f05f0aabdf5.tar.xz mpd-f01d7d230b1835ab035a5130e2a39f05f0aabdf5.zip |
input/file: don't fall back to parent directory
This code has never made any sense, and has broken some of the archive
plugin.
Diffstat (limited to 'src/input/file_input_plugin.c')
-rw-r--r-- | src/input/file_input_plugin.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/input/file_input_plugin.c b/src/input/file_input_plugin.c index 64a4030ab..bda1777ac 100644 --- a/src/input/file_input_plugin.c +++ b/src/input/file_input_plugin.c @@ -36,25 +36,14 @@ input_file_open(struct input_stream *is, const char *filename) int fd, ret; struct stat st; - char* pathname = g_strdup(filename); - if (filename[0] != '/') - { - g_free(pathname); return false; - } - if (stat(filename, &st) < 0) { - char* slash = strrchr(pathname, '/'); - *slash = '\0'; - } - - fd = open(pathname, O_RDONLY); + fd = open(filename, O_RDONLY); if (fd < 0) { is->error = errno; g_debug("Failed to open \"%s\": %s", - pathname, g_strerror(errno)); - g_free(pathname); + filename, g_strerror(errno)); return false; } @@ -64,15 +53,13 @@ input_file_open(struct input_stream *is, const char *filename) if (ret < 0) { is->error = errno; close(fd); - g_free(pathname); return false; } if (!S_ISREG(st.st_mode)) { - g_debug("Not a regular file: %s", pathname); + g_debug("Not a regular file: %s", filename); is->error = EINVAL; close(fd); - g_free(pathname); return false; } @@ -86,8 +73,6 @@ input_file_open(struct input_stream *is, const char *filename) is->data = GINT_TO_POINTER(fd); is->ready = true; - g_free(pathname); - return true; } |