archiveapi: archive plugin for ISO files

configure.ac

@@ -190,6 +190,14 @@ AC_ARG_ENABLE(zip,
 
 AM_CONDITIONAL(HAVE_ZIP, test x$enable_zip = xyes)
 
+AC_ARG_ENABLE(iso9660,
+	AS_HELP_STRING([--enable-iso9660],
+		[enable iso9660 archive support (default: disabled)]),
+	enable_iso=$enableval,
+	enable_iso=no)
+
+AM_CONDITIONAL(HAVE_ISO, test x$enable_iso = xyes)
+
 # archive plugin libraries
 
 AC_CHECK_LIB(bz2, BZ2_bzDecompressInit,[MPD_LIBS="-lbz2";],enable_bz2=no)
@@ -202,6 +210,12 @@ if test x$enable_zip = xyes; then
 	AC_DEFINE(HAVE_ZIP, 1, [Define to have zip archive support])
 fi
 
+AC_CHECK_LIB(iso9660, iso9660_ifs_readdir ,,enable_iso=no)
+if test x$enable_iso = xyes; then
+	MPD_LIBS="$MPD_LIBS -liso9660"
+	AC_DEFINE(HAVE_ISO, 1, [Define to have iso archive support])
+fi
+
 dnl
 dnl decoder plugins
 dnl
@@ -1190,6 +1204,12 @@ else
 	echo " ZIP archives support ..........disabled"
 fi
 
+if test x$enable_iso = xyes; then
+	echo " ISO 9660 archives support .....enabled"
+else
+	echo " ISO 9660 archives support .....disabled"
+fi
+
 echo ""
 echo "##########################################"
 echo ""

src/Makefile.am

@@ -183,6 +183,10 @@ if HAVE_ZIP
 mpd_SOURCES += archive/zip_plugin.c
 endif
 
+if HAVE_ISO
+mpd_SOURCES += archive/iso_plugin.c
+endif
+
 # decoder plugins
 
 if HAVE_MAD

src/archive/iso_plugin.c

@@ -0,0 +1,258 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2008 Viliam Mateicka <viliam.mateicka@gmail.com>
+ * This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/**
+  * iso archive handling (requires cdio, and iso9660)
+  */
+
+#include "archive_api.h"
+#include "input_stream.h"
+#include "utils.h"
+
+#include <cdio/cdio.h>
+#include <cdio/iso9660.h>
+
+#include <glib.h>
+#include <string.h>
+
+#define CEILING(x, y) ((x+(y-1))/y)
+
+typedef struct {
+	iso9660_t *iso;
+	iso9660_stat_t *statbuf;
+	size_t cur_ofs;
+	size_t max_blocks;
+	GSList	*list;
+	GSList	*iter;
+} iso_context;
+
+static const struct input_plugin iso_inputplugin;
+
+/* archive open && listing routine */
+
+static void
+listdir_recur(const char *psz_path, iso_context *context)
+{
+	iso9660_t *iso = context->iso;
+	CdioList_t *entlist;
+	CdioListNode_t *entnode;
+	iso9660_stat_t *statbuf;
+	char pathname[4096];
+
+	entlist = iso9660_ifs_readdir (iso, psz_path);
+	if (!entlist) {
+		return;
+	}
+	/* Iterate over the list of nodes that iso9660_ifs_readdir gives  */
+	_CDIO_LIST_FOREACH (entnode, entlist) {
+		statbuf = (iso9660_stat_t *) _cdio_list_node_data (entnode);
+
+		strcpy(pathname, psz_path);
+		strcat(pathname, statbuf->filename);
+
+		if (_STAT_DIR == statbuf->type ) {
+			if (strcmp(statbuf->filename, ".") && strcmp(statbuf->filename, "..")) {
+				strcat(pathname, "/");
+				listdir_recur(pathname, context);
+			}
+		} else {
+			//remove leading /
+			context->list = g_slist_prepend( context->list,
+				xstrdup(pathname+1));
+		}
+	}
+	_cdio_list_free (entlist, true);
+}
+
+static struct archive_file *
+iso_open(char * pathname)
+{
+	iso_context *context = g_malloc(sizeof(iso_context));
+
+	context->list = NULL;
+
+	/* open archive */
+	context->iso = iso9660_open (pathname);
+	if (context->iso   == NULL) {
+		g_warning("iso %s open failed\n", pathname);
+		return NULL;
+	}
+
+	listdir_recur("/", context);
+
+        return (struct archive_file *)context;
+}
+
+static void
+iso_scan_reset(struct archive_file *file)
+{
+	iso_context *context = (iso_context *) file;
+	//reset iterator
+	context->iter = context->list;
+}
+
+static char *
+iso_scan_next(struct archive_file *file)
+{
+	iso_context *context = (iso_context *) file;
+	char *data = NULL;
+	if (context->iter != NULL) {
+		///fetch data and goto next
+		data = context->iter->data;
+		context->iter = g_slist_next(context->iter);
+	}
+	return data;
+}
+
+static void
+iso_close(struct archive_file *file)
+{
+	iso_context *context = (iso_context *) file;
+	GSList *tmp;
+	if (context->list) {
+		//free list
+		for (tmp = context->list; tmp != NULL; tmp = g_slist_next(tmp))
+			g_free(tmp->data);
+		g_slist_free(context->list);
+	}
+	//close archive
+	iso9660_close(context->iso);
+	context->iso = NULL;
+}
+
+/* single archive handling */
+
+static void
+iso_setup_stream(struct archive_file *file, struct input_stream *is)
+{
+	iso_context *context = (iso_context *) file;
+	//setup file ops
+	is->plugin = &iso_inputplugin;
+	//insert back reference
+	is->archive = context;
+	//we are not seekable
+	is->seekable = false;
+}
+
+
+static bool
+iso_is_open(struct input_stream *is, const char *pathname)
+{
+	iso_context *context = (iso_context *) is->archive;
+
+	context->statbuf = iso9660_ifs_stat_translate (context->iso, pathname);
+
+	if (context->statbuf == NULL) {
+		g_warning("file %s not found in iso\n", pathname);
+		return false;
+	}
+	context->cur_ofs = 0;
+	context->max_blocks = CEILING(context->statbuf->size, ISO_BLOCKSIZE);
+	return true;
+}
+
+static void
+iso_is_close(struct input_stream *is)
+{
+	iso_context *context = (iso_context *) is->archive;
+	g_free(context->statbuf);
+}
+
+
+static size_t
+iso_is_read(struct input_stream *is, void *ptr, size_t size)
+{
+	iso_context *context = (iso_context *) is->archive;
+	int toread, readed = 0;
+	int no_blocks, cur_block;
+	size_t left_bytes = context->statbuf->size - context->cur_ofs;
+
+	size = (size * ISO_BLOCKSIZE) / ISO_BLOCKSIZE;
+
+	if (left_bytes < size) {
+		toread = left_bytes;
+		no_blocks = CEILING(left_bytes,ISO_BLOCKSIZE);
+	} else {
+		toread = size;
+		no_blocks = toread / ISO_BLOCKSIZE;
+	}
+	if (no_blocks > 0) {
+
+		cur_block = context->cur_ofs / ISO_BLOCKSIZE;
+
+		readed = iso9660_iso_seek_read (context->iso, ptr,
+			context->statbuf->lsn + cur_block, no_blocks);
+
+		if (readed != no_blocks * ISO_BLOCKSIZE) {
+			g_warning("error reading ISO file at lsn %lu\n",
+				(long unsigned int) cur_block );
+			return -1;
+		}
+		if (left_bytes < size) {
+			readed = left_bytes;
+		}
+		context->cur_ofs += readed;
+	}
+	return readed;
+}
+
+static bool
+iso_is_eof(struct input_stream *is)
+{
+	iso_context *context = (iso_context *) is->archive;
+	return (context->cur_ofs == context->statbuf->size);
+}
+
+static bool
+iso_is_seek(G_GNUC_UNUSED struct input_stream *is,
+	G_GNUC_UNUSED off_t offset, G_GNUC_UNUSED int whence)
+{
+	return false;
+}
+
+static int
+iso_is_buffer(G_GNUC_UNUSED struct input_stream *is)
+{
+	return 0;
+}
+
+/* exported structures */
+
+static const char *const iso_extensions[] = {
+	"iso",
+	NULL
+};
+
+static const struct input_plugin iso_inputplugin = {
+	.open = iso_is_open,
+	.close = iso_is_close,
+	.read = iso_is_read,
+	.eof = iso_is_eof,
+	.seek = iso_is_seek,
+	.buffer = iso_is_buffer
+};
+
+const struct archive_plugin iso_plugin = {
+	.name = "iso",
+	.open = iso_open,
+	.scan_reset = iso_scan_reset,
+	.scan_next = iso_scan_next,
+	.setup_stream = iso_setup_stream,
+	.close = iso_close,
+	.suffixes = iso_extensions
+};

src/archive_list.c

@@ -29,6 +29,7 @@
 
 extern const struct archive_plugin bz2_plugin;
 extern const struct archive_plugin zip_plugin;
+extern const struct archive_plugin iso_plugin;
 
 static const struct archive_plugin *const archive_plugins[] = {
 #ifdef HAVE_BZ2
@@ -36,6 +37,9 @@ static const struct archive_plugin *const archive_plugins[] = {
 #endif
 #ifdef HAVE_ZIP
 	&zip_plugin,
+#endif
+#ifdef HAVE_ISO
+	&iso_plugin,
 #endif
 	NULL
 };