X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=c04d4f9c99e89afb451afe94be7fcc64461b15e1;hp=944d904dd14aaab70fa8689e8be82ac5f707fd62;hb=ac1f19d550a81c8408c8fce2e237996c950253ab;hpb=3cdcb449fc23f0bebe34343dc26b4e34b82175d5

diff --git a/aft.c b/aft.c
index 944d904d..c04d4f9c 100644
--- a/aft.c
+++ b/aft.c
@@ -50,46 +50,28 @@ static struct ls_data status_item_ls_data;
 
 /** The different sorting methods of the ls command. */
 enum ls_sorting_method {
-	/** -sp (default) */
-	LS_SORT_BY_PATH,
-	/** -ss */
-	LS_SORT_BY_SCORE,
-	/** -sl */
-	LS_SORT_BY_LAST_PLAYED,
-	/** -sn */
-	LS_SORT_BY_NUM_PLAYED,
-	/** -sf */
-	LS_SORT_BY_FREQUENCY,
-	/** -sc */
-	LS_SORT_BY_CHANNELS,
-	/** -si */
-	LS_SORT_BY_IMAGE_ID,
-	/** -sy */
-	LS_SORT_BY_LYRICS_ID,
-	/** -sb */
-	LS_SORT_BY_BITRATE,
-	/** -sd */
-	LS_SORT_BY_DURATION,
-	/** -sa */
-	LS_SORT_BY_AUDIO_FORMAT,
-	/** -sh */
-	LS_SORT_BY_HASH,
+	LS_SORT_BY_PATH, /**< -s=p (default) */
+	LS_SORT_BY_SCORE, /**< -s=s */
+	LS_SORT_BY_LAST_PLAYED, /**< -s=l */
+	LS_SORT_BY_NUM_PLAYED, /**< -s=n */
+	LS_SORT_BY_FREQUENCY, /**< -s=f */
+	LS_SORT_BY_CHANNELS, /**< -s=c */
+	LS_SORT_BY_IMAGE_ID, /**< -s=i */
+	LS_SORT_BY_LYRICS_ID, /**< -s=y */
+	LS_SORT_BY_BITRATE, /**< -s=b */
+	LS_SORT_BY_DURATION, /**< -s=d */
+	LS_SORT_BY_AUDIO_FORMAT, /**< -s=a */
+	LS_SORT_BY_HASH, /**< -s=h */
 };
 
 /** The different listing modes of the ls command. */
 enum ls_listing_mode {
-	/** Default listing mode. */
-	LS_MODE_SHORT,
-	/** -l or -ll */
-	LS_MODE_LONG,
-	/** -lv */
-	LS_MODE_VERBOSE,
-	/** -lm */
-	LS_MODE_MBOX,
-	/** -lc */
-	LS_MODE_CHUNKS,
-	/** -lp */
-	LS_MODE_PARSER,
+	LS_MODE_SHORT, /**< Default listing mode. */
+	LS_MODE_LONG, /**< -l or -l=l */
+	LS_MODE_VERBOSE, /** -l=v */
+	LS_MODE_MBOX, /** -l=m */
+	LS_MODE_CHUNKS, /** -l=c */
+	LS_MODE_PARSER, /** -l=p */
 };
 
 /**
@@ -414,7 +396,7 @@ static void save_chunk_table(struct afh_info *afhi, char *buf)
 {
 	uint32_t n;
 
-	if (!afhi->chunk_table)
+	if (!afhi->chunk_table || afhi->chunks_total == 0)
 		return;
 	for (n = 0; n <= afhi->chunks_total; n++)
 		write_u32(buf + 4 * n, afhi->chunk_table[n]);
@@ -983,7 +965,18 @@ out:
 	WRITE_STATUS_ITEM(pb, SI_file_size, "%ld\n", statbuf.st_size / 1024);
 }
 
-static int make_status_items(void)
+/**
+ * Deallocate and invalidate the status item strings.
+ *
+ * This needs to be a public function so that afs.c can call it on shutdown.
+ */
+void free_status_items(void)
+{
+	freep(&status_items);
+	freep(&parser_friendly_status_items);
+}
+
+static void make_status_items(void)
 {
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(LS);
 	char *argv[] = {"ls", "--admissible", "--listing-mode=verbose"};
@@ -992,8 +985,9 @@ 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;
+		return;
 	ret = lls_parse(ARRAY_SIZE(argv), argv, cmd, &opts.lpr, NULL);
 	assert(ret >= 0);
 	time(&current_time);
@@ -1001,25 +995,24 @@ 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) {
+		PARA_WARNING_LOG("could not create status items: %s\n",
+			para_strerror(-ret));
+		free_status_items();
+	}
 	lls_free_parse_result(opts.lpr, cmd);
-	return ret;
 }
 
 /**