X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=e470a737d4c9224bf06336c02f02c77ff1c8fa24;hp=bf11dc9b8e82c06c78a684e983836fc4348090d7;hb=b5d4ebe6e9694c7aba429c6a4a0cc30c25e1640f;hpb=58b83584e38da0c5043497320f90e166cc4aff38

diff --git a/vss.c b/vss.c
index bf11dc9b..e470a737 100644
--- a/vss.c
+++ b/vss.c
@@ -29,8 +29,6 @@
 #include "ipc.h"
 #include "fd.h"
 
-extern const char *status_item_list[];
-
 static struct timeval announce_tv;
 static struct timeval data_send_barrier;
 static struct timeval eof_barrier;
@@ -186,6 +184,8 @@ static void vss_eof(void)
 			senders[i].shutdown_clients();
 		return;
 	}
+	if (mmd->new_vss_status_flags & VSS_NOMORE)
+		mmd->new_vss_status_flags = VSS_NEXT;
 	gettimeofday(&now, NULL);
 	tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
 	munmap(map, mmd->size);
@@ -195,10 +195,11 @@ static void vss_eof(void)
 	mmd->afd.afhi.seconds_total = 0;
 	free(mmd->afd.afhi.chunk_table);
 	mmd->afd.afhi.chunk_table = NULL;
-	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
-		status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
+	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
+		status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]);
 	strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string));
 	mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0';
+	make_empty_status_items(mmd->afd.verbose_ls_output);
 	free(tmp);
 	mmd->mtime = 0;
 	mmd->size = 0;
@@ -302,8 +303,6 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 				tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
 			if (vss_repos())
 				tv_add(&now, &announce_tv, &data_send_barrier);
-			if (mmd->new_vss_status_flags & VSS_NOMORE)
-				mmd->new_vss_status_flags = VSS_NEXT;
 		}
 		mmd->chunks_sent = 0;
 	}