aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-08 21:20:41 +0100
committerMax Kellermann <max@duempel.org>2009-01-08 21:20:41 +0100
commitf0980283bcce8ad7819f71bc49b973e28e54b22d (patch)
tree8687499f03fc91809fcff2e5d9fb11f3446d27dd /src
parent7a9a1e3e3184b12e7393f8718154acc89865cf19 (diff)
downloadmpd-f0980283bcce8ad7819f71bc49b973e28e54b22d.tar.gz
mpd-f0980283bcce8ad7819f71bc49b973e28e54b22d.tar.xz
mpd-f0980283bcce8ad7819f71bc49b973e28e54b22d.zip
update: include config.h, fix archive code
The archive code was disabled, because config.h was not included and thus ENABLE_ARCHIVE was not defined.
Diffstat (limited to 'src')
-rw-r--r--src/update.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/update.c b/src/update.c
index ea8b3f820..691f533b5 100644
--- a/src/update.c
+++ b/src/update.c
@@ -25,6 +25,7 @@
#include "mapper.h"
#include "path.h"
#include "decoder_list.h"
+#include "archive_list.h"
#include "playlist.h"
#include "event_pipe.h"
#include "notify.h"
@@ -33,6 +34,7 @@
#include "conf.h"
#include "stats.h"
#include "main.h"
+#include "config.h"
#include <glib.h>
@@ -350,6 +352,9 @@ update_regular_file(struct directory *directory,
const char *name, const struct stat *st)
{
const char *suffix = uri_get_suffix(name);
+#ifdef ENABLE_ARCHIVE
+ const struct archive_plugin *archive;
+#endif
if (suffix == NULL)
return;
@@ -376,9 +381,9 @@ update_regular_file(struct directory *directory,
#ifdef ENABLE_ARCHIVE
} else if ((archive = archive_plugin_from_suffix(suffix))) {
struct archive_file *archfile;
- char pathname[MPD_PATH_MAX];
+ char *pathname;
- map_directory_child_fs(directory, name, pathname);
+ pathname = map_directory_child_fs(directory, name);
//open archive
archfile = archive->open(pathname);
if (archfile) {
@@ -404,6 +409,8 @@ update_regular_file(struct directory *directory,
} else {
g_warning("unable to open archive %s", pathname);
}
+
+ g_free(pathname);
#endif
}
}
@@ -415,10 +422,6 @@ static void
updateInDirectory(struct directory *directory,
const char *name, const struct stat *st)
{
-#ifdef ENABLE_ARCHIVE
- const struct archive_plugin *archive;
-#endif
-
assert(strchr(name, '/') == NULL);
if (S_ISREG(st->st_mode)) {