9 files changed, 43 insertions, 268 deletions

diff --git a/src/input/lastfm_input_plugin.h b/src/decoder_print.h
index d0eaf5a55..6ba5dd081 100644
--- a/src/input/lastfm_input_plugin.h
+++ b/src/decoder_print.h
@@ -17,9 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef LASTFM_INPUT_PLUGIN_H
-#define LASTFM_INPUT_PLUGIN_H
+#ifndef MPD_DECODER_PRINT_H
+#define MPD_DECODER_PRINT_H
 
-extern const struct input_plugin lastfm_input_plugin;
+struct client;
+
+void
+decoder_list_print(struct client *client);
 
 #endif
diff --git a/src/input/archive_input_plugin.c b/src/input/archive_input_plugin.c
index 6239f4298..a98bd9e2a 100644
--- a/src/input/archive_input_plugin.c
+++ b/src/input/archive_input_plugin.c
@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "input/archive_input_plugin.h"
 #include "archive_api.h"
 #include "archive_list.h"
diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c
index 95d269ce5..49defc7fe 100644
--- a/src/input/curl_input_plugin.c
+++ b/src/input/curl_input_plugin.c
@@ -17,12 +17,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "input/curl_input_plugin.h"
 #include "input_plugin.h"
 #include "conf.h"
-#include "config.h"
 #include "tag.h"
 #include "icy_metadata.h"
+#include "glib_compat.h"
 
 #include <assert.h>
 
@@ -42,7 +43,7 @@
 #define G_LOG_DOMAIN "input_curl"
 
 /** rewinding is possible after up to 64 kB */
-static const off_t max_rewind_size = 64 * 1024;
+static const goffset max_rewind_size = 64 * 1024;
 
 /**
  * Buffers created by input_curl_writefunction().
@@ -150,11 +151,6 @@ buffer_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data)
 	g_free(data);
 }
 
-/* g_queue_clear() was introduced in GLib 2.14 */
-#if !GLIB_CHECK_VERSION(2,14,0)
-#define g_queue_clear(q) do { g_queue_free(q); q = g_queue_new(); } while (0)
-#endif
-
 /**
  * Frees the current "libcurl easy" handle, and everything associated
  * with it.
@@ -407,8 +403,8 @@ copy_icy_tag(struct input_curl *c)
 	if (c->tag != NULL)
 		tag_free(c->tag);
 
-	if (c->meta_name != NULL && !tag_has_type(tag, TAG_ITEM_NAME))
-		tag_add_item(tag, TAG_ITEM_NAME, c->meta_name);
+	if (c->meta_name != NULL && !tag_has_type(tag, TAG_NAME))
+		tag_add_item(tag, TAG_NAME, c->meta_name);
 
 	c->tag = tag;
 }
@@ -425,7 +421,7 @@ input_curl_read(struct input_stream *is, void *ptr, size_t size)
 #ifndef NDEBUG
 	if (c->rewind != NULL &&
 	    (!g_queue_is_empty(c->rewind) || is->offset == 0)) {
-		off_t offset = 0;
+		goffset offset = 0;
 		struct buffer *buffer;
 
 		for (GList *list = g_queue_peek_head_link(c->rewind);
@@ -474,11 +470,11 @@ input_curl_read(struct input_stream *is, void *ptr, size_t size)
 	if (icy_defined(&c->icy_metadata))
 		copy_icy_tag(c);
 
-	is->offset += (off_t)nbytes;
+	is->offset += (goffset)nbytes;
 
 #ifndef NDEBUG
 	if (rewind_buffers != NULL) {
-		off_t offset = 0;
+		goffset offset = 0;
 		struct buffer *buffer;
 
 		for (GList *list = g_queue_peek_head_link(c->rewind);
@@ -614,7 +610,7 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
 			tag_free(c->tag);
 
 		c->tag = tag_new();
-		tag_add_item(c->tag, TAG_ITEM_NAME, c->meta_name);
+		tag_add_item(c->tag, TAG_NAME, c->meta_name);
 	} else if (g_ascii_strcasecmp(name, "icy-metaint") == 0) {
 		char buffer[64];
 		size_t icy_metaint;
@@ -772,7 +768,7 @@ input_curl_can_rewind(struct input_stream *is)
 	/* rewind is possible if this is the very first buffer of the
 	   resource */
 	buffer = (struct buffer*)g_queue_peek_head(c->buffers);
-	return (off_t)buffer->consumed == is->offset;
+	return (goffset)buffer->consumed == is->offset;
 }
 
 static void
@@ -780,7 +776,7 @@ input_curl_rewind(struct input_stream *is)
 {
 	struct input_curl *c = is->data;
 #ifndef NDEBUG
-	off_t offset = 0;
+	goffset offset = 0;
 #endif
 
 	assert(c->rewind != NULL);
@@ -818,7 +814,7 @@ input_curl_rewind(struct input_stream *is)
 }
 
 static bool
-input_curl_seek(struct input_stream *is, off_t offset, int whence)
+input_curl_seek(struct input_stream *is, goffset offset, int whence)
 {
 	struct input_curl *c = is->data;
 	bool ret;
@@ -884,7 +880,7 @@ input_curl_seek(struct input_stream *is, off_t offset, int whence)
 		buffer = (struct buffer *)g_queue_pop_head(c->buffers);
 
 		length = buffer->size - buffer->consumed;
-		if (offset - is->offset < (off_t)length)
+		if (offset - is->offset < (goffset)length)
 			length = offset - is->offset;
 
 		buffer = consume_buffer(buffer, length, rewind_buffers);
diff --git a/src/input/file_input_plugin.c b/src/input/file_input_plugin.c
index 64a4030ab..8561d04e7 100644
--- a/src/input/file_input_plugin.c
+++ b/src/input/file_input_plugin.c
@@ -17,8 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h" /* must be first for large file support */
 #include "input/file_input_plugin.h"
 #include "input_plugin.h"
+#include "fd_util.h"
 
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -38,7 +40,7 @@ input_file_open(struct input_stream *is, const char *filename)
 
 	char* pathname = g_strdup(filename);
 
-	if (filename[0] != '/')
+	if (!g_path_is_absolute(filename))
 	{
 		g_free(pathname);
 		return false;
@@ -49,7 +51,7 @@ input_file_open(struct input_stream *is, const char *filename)
 		*slash = '\0';
 	}
 
-	fd = open(pathname, O_RDONLY);
+	fd = open_cloexec(pathname, O_RDONLY, 0);
 	if (fd < 0) {
 		is->error = errno;
 		g_debug("Failed to open \"%s\": %s",
@@ -92,11 +94,11 @@ input_file_open(struct input_stream *is, const char *filename)
 }
 
 static bool
-input_file_seek(struct input_stream *is, off_t offset, int whence)
+input_file_seek(struct input_stream *is, goffset offset, int whence)
 {
 	int fd = GPOINTER_TO_INT(is->data);
 
-	offset = lseek(fd, offset, whence);
+	offset = (goffset)lseek(fd, (off_t)offset, whence);
 	if (offset < 0) {
 		is->error = errno;
 		return false;
diff --git a/src/input/lastfm_input_plugin.c b/src/input/lastfm_input_plugin.c
deleted file mode 100644
index 8e13a60a9..000000000
--- a/src/input/lastfm_input_plugin.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (C) 2003-2009 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "input/lastfm_input_plugin.h"
-#include "input/curl_input_plugin.h"
-#include "input_plugin.h"
-#include "conf.h"
-
-#include <string.h>
-
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "input_lastfm"
-
-static const char *lastfm_user, *lastfm_password;
-
-static bool
-lastfm_input_init(const struct config_param *param)
-{
-	lastfm_user = config_get_block_string(param, "user", NULL);
-	lastfm_password = config_get_block_string(param, "password", NULL);
-
-	return lastfm_user != NULL && lastfm_password != NULL;
-}
-
-static char *
-lastfm_get(const char *url)
-{
-	struct input_stream input_stream;
-	bool success;
-	int ret;
-	char buffer[4096];
-	size_t length = 0, nbytes;
-
-	success = input_stream_open(&input_stream, url);
-	if (!success)
-		return NULL;
-
-	while (!input_stream.ready) {
-		ret = input_stream_buffer(&input_stream);
-		if (ret < 0) {
-			input_stream_close(&input_stream);
-			return NULL;
-		}
-	}
-
-	do {
-		nbytes = input_stream_read(&input_stream, buffer + length,
-					   sizeof(buffer) - length);
-		if (nbytes == 0) {
-			if (input_stream_eof(&input_stream))
-				break;
-
-			/* I/O error */
-			input_stream_close(&input_stream);
-			return NULL;
-		}
-
-		length += nbytes;
-	} while (length < sizeof(buffer));
-
-	input_stream_close(&input_stream);
-	return g_strndup(buffer, length);
-}
-
-static char *
-lastfm_find(const char *response, const char *name)
-{
-	size_t name_length = strlen(name);
-
-	while (true) {
-		const char *eol = strchr(response, '\n');
-		if (eol == NULL)
-			return NULL;
-
-		if (strncmp(response, name, name_length) == 0 &&
-		    response[name_length] == '=') {
-			response += name_length + 1;
-			return g_strndup(response, eol - response);
-		}
-
-		response = eol + 1;
-	}
-}
-
-static bool
-lastfm_input_open(struct input_stream *is, const char *url)
-{
-	char *md5, *p, *q, *response, *session, *stream_url;
-	bool success;
-
-	if (strncmp(url, "lastfm://", 9) != 0)
-		return false;
-
-	/* handshake */
-
-#if GLIB_CHECK_VERSION(2,16,0)
-	q = g_uri_escape_string(lastfm_user, NULL, false);
-#else
-	q = g_strdup(lastfm_user);
-#endif
-
-#if GLIB_CHECK_VERSION(2,16,0)
-	if (strlen(lastfm_password) != 32)
-		md5 = g_compute_checksum_for_string(G_CHECKSUM_MD5,
-						    lastfm_password,
-						    strlen(lastfm_password));
-	else
-#endif
-		md5 = g_strdup(lastfm_password);
-
-	p = g_strconcat("http://ws.audioscrobbler.com/radio/handshake.php?"
-			"version=1.1.1&platform=linux&"
-			"username=", q, "&"
-			"passwordmd5=", md5, "&debug=0&partner=", NULL);
-	g_free(q);
-	g_free(md5);
-
-	response = lastfm_get(p);
-	g_free(p);
-	if (response == NULL)
-		return false;
-
-	/* extract session id from response */
-
-	session = lastfm_find(response, "session");
-	stream_url = lastfm_find(response, "stream_url");
-	g_free(response);
-	if (session == NULL || stream_url == NULL) {
-		g_free(session);
-		g_free(stream_url);
-		return false;
-	}
-
-#if GLIB_CHECK_VERSION(2,16,0)
-		q = g_uri_escape_string(session, NULL, false);
-		g_free(session);
-		session = q;
-#endif
-
-	/* "adjust" last.fm radio */
-
-	if (strlen(url) > 9) {
-		char *escaped_url;
-
-#if GLIB_CHECK_VERSION(2,16,0)
-		escaped_url = g_uri_escape_string(url, NULL, false);
-#else
-		escaped_url = g_strdup(url);
-#endif
-
-		p = g_strconcat("http://ws.audioscrobbler.com/radio/adjust.php?"
-				"session=", session, "&url=", escaped_url, "&debug=0",
-				NULL);
-		g_free(escaped_url);
-
-		response = lastfm_get(p);
-		g_free(response);
-		g_free(p);
-
-		if (response == NULL) {
-			g_free(session);
-			g_free(stream_url);
-			return false;
-		}
-	}
-
-	/* load the last.fm playlist */
-
-	p = g_strconcat("http://ws.audioscrobbler.com/radio/xspf.php?"
-			"sk=", session, "&discovery=0&desktop=1.5.1.31879",
-			NULL);
-	g_free(session);
-
-	response = lastfm_get(p);
-	g_free(p);
-
-	if (response == NULL) {
-		g_free(stream_url);
-		return false;
-	}
-
-	p = strstr(response, "<location>");
-	if (p == NULL) {
-		g_free(response);
-		g_free(stream_url);
-		return false;
-	}
-
-	p += 10;
-	q = strchr(p, '<');
-
-	if (q == NULL) {
-		g_free(response);
-		g_free(stream_url);
-		return false;
-	}
-
-	g_free(stream_url);
-	stream_url = g_strndup(p, q - p);
-	g_free(response);
-
-	/* now really open the last.fm radio stream */
-
-	success = input_stream_open(is, stream_url);
-	g_free(stream_url);
-	return success;
-}
-
-const struct input_plugin lastfm_input_plugin = {
-	.name = "lastfm",
-	.init = lastfm_input_init,
-	.open = lastfm_input_open,
-};
diff --git a/src/input/mms_input_plugin.c b/src/input/mms_input_plugin.c
index 2a3c53776..eb2665afb 100644
--- a/src/input/mms_input_plugin.c
+++ b/src/input/mms_input_plugin.c
@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "input/mms_input_plugin.h"
 #include "input_plugin.h"
 
@@ -110,7 +111,7 @@ input_mms_buffer(G_GNUC_UNUSED struct input_stream *is)
 
 static bool
 input_mms_seek(G_GNUC_UNUSED struct input_stream *is,
-	       G_GNUC_UNUSED off_t offset, G_GNUC_UNUSED int whence)
+	       G_GNUC_UNUSED goffset offset, G_GNUC_UNUSED int whence)
 {
 	return false;
 }
diff --git a/src/input_plugin.h b/src/input_plugin.h
index 8fe852bc6..f38174d42 100644
--- a/src/input_plugin.h
+++ b/src/input_plugin.h
@@ -53,7 +53,7 @@ struct input_plugin {
 	int (*buffer)(struct input_stream *is);
 	size_t (*read)(struct input_stream *is, void *ptr, size_t size);
 	bool (*eof)(struct input_stream *is);
-	bool (*seek)(struct input_stream *is, off_t offset, int whence);
+	bool (*seek)(struct input_stream *is, goffset offset, int whence);
 };
 
 #endif
diff --git a/src/input_stream.c b/src/input_stream.c
index 69dc644a2..0174b5a2e 100644
--- a/src/input_stream.c
+++ b/src/input_stream.c
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "input_plugin.h"
 #include "config.h"
+#include "input_plugin.h"
 #include "conf.h"
 
 #include "input/file_input_plugin.h"
@@ -27,12 +27,10 @@
 #include "input/archive_input_plugin.h"
 #endif
 
-#ifdef HAVE_CURL
+#ifdef ENABLE_CURL
 #include "input/curl_input_plugin.h"
 #endif
 
-#include "input/lastfm_input_plugin.h"
-
 #ifdef ENABLE_MMS
 #include "input/mms_input_plugin.h"
 #endif
@@ -46,12 +44,9 @@ static const struct input_plugin *const input_plugins[] = {
 #ifdef ENABLE_ARCHIVE
 	&input_plugin_archive,
 #endif
-#ifdef HAVE_CURL
+#ifdef ENABLE_CURL
 	&input_plugin_curl,
 #endif
-#ifdef ENABLE_LASTFM
-	&lastfm_input_plugin,
-#endif
 #ifdef ENABLE_MMS
 	&input_plugin_mms,
 #endif
@@ -139,7 +134,7 @@ input_stream_open(struct input_stream *is, const char *url)
 }
 
 bool
-input_stream_seek(struct input_stream *is, off_t offset, int whence)
+input_stream_seek(struct input_stream *is, goffset offset, int whence)
 {
 	if (is->plugin->seek == NULL)
 		return false;
diff --git a/src/input_stream.h b/src/input_stream.h
index 35b0d44fd..a617632a0 100644
--- a/src/input_stream.h
+++ b/src/input_stream.h
@@ -20,11 +20,17 @@
 #ifndef MPD_INPUT_STREAM_H
 #define MPD_INPUT_STREAM_H
 
+#include "check.h"
+
+#include <glib.h>
+
 #include <stddef.h>
 #include <stdbool.h>
 #include <sys/types.h>
 
-struct input_stream;
+#if !GLIB_CHECK_VERSION(2,14,0)
+typedef gint64 goffset;
+#endif
 
 struct input_stream {
 	/**
@@ -56,12 +62,12 @@ struct input_stream {
 	/**
 	 * the size of the resource, or -1 if unknown
 	 */
-	off_t size;
+	goffset size;
 
 	/**
 	 * the current offset within the stream
 	 */
-	off_t offset;
+	goffset offset;
 
 	/**
 	 * the MIME content type of the resource, or NULL if unknown
@@ -106,7 +112,7 @@ input_stream_close(struct input_stream *is);
  * @param whence the base of the seek, one of SEEK_SET, SEEK_CUR, SEEK_END
  */
 bool
-input_stream_seek(struct input_stream *is, off_t offset, int whence);
+input_stream_seek(struct input_stream *is, goffset offset, int whence);
 
 /**
  * Returns true if the stream has reached end-of-file.