X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;h=2d2f23b4eb9c6df6b2d9ff9157a9716f09c1fcc6;hp=826280b9270ff9bc8c9a37f46e376d69a1422671;hb=64a9cf5877ab9ecf6410596d657914f26830d3f7;hpb=00581ce02d1b5391569c8f3fc7739274b31bacf8

diff --git a/playlist.c b/playlist.c
index 826280b9..2d2f23b4 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1,14 +1,18 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
+#include <regex.h>
+#include <osl.h>
+
 #include "para.h"
 #include "error.h"
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
+#include "ipc.h"
 
 /** \file playlist.c Functions for loading and saving playlists. */
 
@@ -41,12 +45,12 @@ static int add_playlist_entry(char *path, void *data)
 	int ret = aft_get_row_of_path(path, &aft_row);
 
 	if (ret < 0) {
-		PARA_NOTICE_LOG("%s: %s\n", path, PARA_STRERROR(-ret));
+		PARA_NOTICE_LOG("%s: %s\n", path, para_strerror(-ret));
 		return 1;
 	}
 	ret = score_add(aft_row, -playlist->length);
 	if (ret < 0) {
-		PARA_ERROR_LOG("failed to add %s: %s\n", path, PARA_STRERROR(-ret));
+		PARA_ERROR_LOG("failed to add %s: %s\n", path, para_strerror(-ret));
 		return ret;
 	}
 	playlist->length++;
@@ -80,7 +84,7 @@ static int load_playlist(struct osl_row *row, void *data)
 err:
 	if (ret != -E_DUMMY_ROW)
 		PARA_NOTICE_LOG("unable to load playlist (%s)\n",
-			PARA_STRERROR(-ret));
+			para_strerror(-ret));
 	return 1;
 }
 
@@ -90,9 +94,9 @@ static int check_playlist_path(char *path, void *data)
 	struct osl_row *aft_row;
 	int ret = aft_get_row_of_path(path, &aft_row);
 
-	if (ret < 0)
-		para_printf(pb, "%s: %s\n", path, PARA_STRERROR(-ret));
-	return 1;
+	if (ret >= 0)
+		return 1;
+	return para_printf(pb, "%s: %s\n", path, para_strerror(-ret));
 }
 
 static int check_playlist(struct osl_row *row, void *data)
@@ -102,39 +106,44 @@ static int check_playlist(struct osl_row *row, void *data)
 	char *playlist_name;
 	int ret = pl_get_name_and_def_by_row(row, &playlist_name, &playlist_def);
 
-	if (ret < 0) {
-		para_printf(pb, "failed to get playlist data: %s\n",
-			PARA_STRERROR(-ret));
-		return 1;
-	}
+	if (ret < 0)
+		return para_printf(pb, "failed to get playlist data: %s\n",
+			para_strerror(-ret));
 	if (*playlist_name) { /* skip dummy row */
-		para_printf(pb, "checking playlist %s...\n", playlist_name);
-		for_each_line_ro(playlist_def.data, playlist_def.size,
+		ret = para_printf(pb, "checking playlist %s...\n", playlist_name);
+		if (ret < 0)
+			return ret;
+		ret = for_each_line_ro(playlist_def.data, playlist_def.size,
 			check_playlist_path, pb);
 	}
 	osl_close_disk_object(&playlist_def);
-	return 1;
+	return ret;
 }
 
 /**
  * Check the playlist table for inconsistencies.
  *
+ * \param fd The afs socket.
  * \param query Unused.
- * \param result Contains messages about inconsistencies.
  *
  * \return The return value of the underlying call to osl_rbtree_loop().
  */
-int playlist_check_callback(__a_unused const struct osl_object *query,
-		struct osl_object *result)
+void playlist_check_callback(int fd, __a_unused const struct osl_object *query)
 {
-	struct para_buffer pb = {.buf = NULL};
+	struct para_buffer pb = {
+		.max_size = SHMMAX,
+		.private_data = &fd,
+		.max_size_handler = pass_buffer_as_shm
+	};
+	int ret = para_printf(&pb, "checking playlists...\n");
 
-	para_printf(&pb, "checking playlists...\n");
+	if (ret < 0)
+		return;
 	osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb,
 		check_playlist);
-	result->data = pb.buf;
-	result->size = pb.size;
-	return 1;
+	if (pb.offset)
+		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+	free(pb.buf);
 }
 
 /**
@@ -168,7 +177,7 @@ int playlist_open(char *name)
 
 	obj.data = name;
 	obj.size = strlen(obj.data);
-	ret = osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row);
+	ret = osl(osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row));
 	if (ret < 0) {
 		PARA_NOTICE_LOG("failed to load playlist %s\n", name);
 		return ret;