X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=15769d55498b9b5ad6aa11f86efdebde31afc417;hp=4433730647f1e95452fdfbd1853b563abf5e43fe;hb=e2167286448ce2ed9a01a548e7e9832563035088;hpb=767a4a54c967bc4b80bd14d02e89fe91acd848dd

diff --git a/aft.c b/aft.c
index 44337306..15769d55 100644
--- a/aft.c
+++ b/aft.c
@@ -22,9 +22,30 @@
 #include "sideband.h"
 #include "command.h"
 
-static struct osl_table *audio_file_table;
+/* Data about one audio file. Needed for ls and stat output. */
+struct ls_data {
+	/* Usual audio format handler information. */
+	struct afh_info afhi;
+	/* Audio file selector information. */
+	struct afs_info afsi;
+	/* The full path of the audio file. */
+	char *path;
+	/* The score value (if -a was given). */
+	long score;
+	/* The hash value of the audio file data. */
+	unsigned char *hash;
+};
+
+/*
+ * The internal state of the audio file table is described by the following
+ * variables which are private to aft.c.
+ */
+static struct osl_table *audio_file_table; /* NULL if table not open */
+static struct osl_row *current_aft_row; /* NULL if no audio file open */
+
 static char *status_items;
 static char *parser_friendly_status_items;
+static struct ls_data status_item_ls_data;
 
 /** The different sorting methods of the ls command. */
 enum ls_sorting_method {
@@ -70,20 +91,6 @@ enum ls_listing_mode {
 	LS_MODE_PARSER,
 };
 
-/* Data about one audio file. Needed for ls and stat output. */
-struct ls_data {
-	/* Usual audio format handler information. */
-	struct afh_info afhi;
-	/* Audio file selector information. */
-	struct afs_info afsi;
-	/* The full path of the audio file. */
-	char *path;
-	/* The score value (if -a was given). */
-	long score;
-	/* The hash value of the audio file data. */
-	unsigned char *hash;
-};
-
 /**
  * The size of the individual output fields of the ls command.
  *
@@ -954,9 +961,6 @@ out:
 	return ret;
 }
 
-static struct ls_data status_item_ls_data;
-static struct osl_row *current_aft_row;
-
 static void make_inode_status_items(struct para_buffer *pb)
 {
 	struct stat statbuf = {.st_size = 0};
@@ -978,6 +982,12 @@ out:
 	WRITE_STATUS_ITEM(pb, SI_file_size, "%ld\n", statbuf.st_size / 1024);
 }
 
+void free_status_items(void)
+{
+	freep(&status_items);
+	freep(&parser_friendly_status_items);
+}
+
 static int make_status_items(void)
 {
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(LS);
@@ -987,6 +997,7 @@ static int make_status_items(void)
 	time_t current_time;
 	int ret;
 
+	free_status_items();
 	if (!status_item_ls_data.path) /* no audio file open */
 		return 0;
 	ret = lls_parse(ARRAY_SIZE(argv), argv, cmd, &opts.lpr, NULL);
@@ -996,23 +1007,20 @@ static int make_status_items(void)
 	if (ret < 0)
 		goto out;
 	make_inode_status_items(&pb);
-	free(status_items);
 	status_items = pb.buf;
 
 	memset(&pb, 0, sizeof(pb));
 	pb.max_size = shm_get_shmmax() - 1;
 	pb.flags = PBF_SIZE_PREFIX;
 	ret = print_list_item(&status_item_ls_data, &opts, &pb, current_time);
-	if (ret < 0) {
-		free(status_items);
-		status_items = NULL;
-		return ret;
-	}
+	if (ret < 0)
+		goto out;
 	make_inode_status_items(&pb);
-	free(parser_friendly_status_items);
 	parser_friendly_status_items = pb.buf;
 	ret = 1;
 out:
+	if (ret < 0)
+		free_status_items();
 	lls_free_parse_result(opts.lpr, cmd);
 	return ret;
 }
@@ -1590,7 +1598,7 @@ ACTION:	Table modifications to be done by the callback.
 +----+----+---+------+---------------------------------------------------+
 | N  |  N | Y |  Y   | (new file) create new entry (force has no effect)
 +----+----+---+------+---------------------------------------------------+
-|  N |  N | N |  Y   | (new file) create new entry
+| N  |  N | N |  Y   | (new file) create new entry
 +----+----+---+------+---------------------------------------------------+
 
 Notes:
@@ -2577,6 +2585,7 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 		 * every time.
 		 */
 		make_status_items();
+		return 0;
 	} default:
 		return 0;
 	}