X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=a219c2dd1eb1b10744ee15381560fc7cd2fe3039;hp=ced2e451bafe4534671bbdb492066f4beeb8e1bb;hb=442a3320ff155d09b990c0ee2abace399cbcd6dd;hpb=799df0ceb9d496cb11a60ad130d664836df69823

diff --git a/afs.c b/afs.c
index ced2e451..a219c2dd 100644
--- a/afs.c
+++ b/afs.c
@@ -22,8 +22,8 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "server.h"
 #include "net.h"
+#include "server.h"
 #include "ipc.h"
 #include "list.h"
 #include "sched.h"
@@ -366,8 +366,8 @@ int for_each_matching_row(struct pattern_match_data *pmd)
  */
 int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 {
-	const char *str1 = (const char *)obj1->data;
-	const char *str2 = (const char *)obj2->data;
+	const char *str1 = obj1->data;
+	const char *str2 = obj2->data;
 	return strncmp(str1, str2, PARA_MIN(obj1->size, obj2->size));
 }
 
@@ -589,8 +589,9 @@ static int com_select_callback(struct afs_callback_arg *aca)
 	para_printf(&aca->pbout, "activating dummy mood\n");
 	activate_mood_or_playlist(NULL, &num_admissible, NULL);
 out:
-	para_printf(&aca->pbout, "activated %s (%d admissible files)\n",
-		current_mop? current_mop : "dummy mood", num_admissible);
+	para_printf(&aca->pbout, "activated %s (%d admissible file%s)\n",
+		current_mop? current_mop : "dummy mood", num_admissible,
+			num_admissible == 1? "" : "s");
 free_lpr:
 	lls_free_parse_result(aca->lpr, cmd);
 	return ret;
@@ -638,16 +639,18 @@ static int setup_command_socket_or_die(void)
 	return socket_fd;
 }
 
+static char *database_dir;
+
 static void close_afs_tables(void)
 {
 	int i;
 	PARA_NOTICE_LOG("closing afs_tables\n");
 	for (i = 0; i < NUM_AFS_TABLES; i++)
 		afs_tables[i].close();
+	free(database_dir);
+	database_dir = NULL;
 }
 
-static char *database_dir;
-
 static void get_database_dir(void)
 {
 	if (!database_dir) {
@@ -685,8 +688,7 @@ static int open_afs_tables(void)
 		ret = afs_tables[i].open(database_dir);
 		if (ret >= 0)
 			continue;
-		PARA_ERROR_LOG("%s open: %s\n", afs_tables[i].name,
-			para_strerror(-ret));
+		PARA_ERROR_LOG("could not open %s\n", afs_tables[i].name);
 		break;
 	}
 	if (ret >= 0)
@@ -979,7 +981,7 @@ __noreturn void afs_init(int socket_fd)
 	int i, ret;
 
 	register_signal_task(&s);
-	INIT_LIST_HEAD(&afs_client_list);
+	init_list_head(&afs_client_list);
 	for (i = 0; i < NUM_AFS_TABLES; i++)
 		afs_tables[i].init(&afs_tables[i]);
 	ret = open_afs_tables();
@@ -1007,6 +1009,9 @@ __noreturn void afs_init(int socket_fd)
 out_close:
 	close_afs_tables();
 out:
+	signal_shutdown(signal_task);
+	free_status_items();
+	free(current_mop);
 	free_lpr();
 	if (ret < 0)
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
@@ -1019,6 +1024,7 @@ static int com_init_callback(struct afs_callback_arg *aca)
 	int i, ret;
 
 	close_afs_tables();
+	get_database_dir();
 	for (i = 0; i < NUM_AFS_TABLES; i++) {
 		struct afs_table *t = &afs_tables[i];
 
@@ -1037,7 +1043,8 @@ static int com_init_callback(struct afs_callback_arg *aca)
 	}
 	ret = open_afs_tables();
 	if (ret < 0)
-		para_printf(&aca->pbout, "cannot open afs tables\n");
+		para_printf(&aca->pbout, "cannot open afs tables: %s\n",
+			para_strerror(-ret));
 out:
 	return ret;
 }