X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=c8c98e7ab679b5a5254eed9405afa3cca6cf870e;hp=eb955e019f538e3d73f38074ff657c9b86d2199d;hb=2176cbf10d8f3815f0a17bcc35e4d2e79440d26c;hpb=5d27648bfa9921f158e700151296af3e4c4fe13c

diff --git a/aft.c b/aft.c
index eb955e01..c8c98e7a 100644
--- a/aft.c
+++ b/aft.c
@@ -721,7 +721,8 @@ __a_const static short unsigned get_duration_width(int seconds)
 	return width + 6;
 }
 
-static void get_duration_buf(int seconds, char *buf, struct ls_options *opts)
+static void get_duration_buf(int seconds, char *buf, size_t bufsize,
+		struct ls_options *opts)
 {
 	unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60;
 	short unsigned max_width;
@@ -729,10 +730,12 @@ static void get_duration_buf(int seconds, char *buf, struct ls_options *opts)
 	if (!hours) { /* m:ss or mm:ss */
 		max_width = opts->mode == LS_MODE_LONG?
 			opts->widths.duration_width : 4;
+		assert(max_width < bufsize - 1);
 		sprintf(buf, "%*u:%02d", max_width - 3, mins, seconds % 60);
 	} else { /* more than one hour => h:mm:ss, hh:mm:ss, hhh:mm:ss, ... */
 		max_width = opts->mode == LS_MODE_LONG?
 			opts->widths.duration_width : 7;
+		assert(max_width < bufsize - 1);
 		sprintf(buf, "%*u:%02u:%02d", max_width - 6, hours, mins,
 			seconds % 60);
 	}
@@ -856,7 +859,8 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		if (ret < 0)
 			goto out;
 	}
-	get_duration_buf(afhi->seconds_total, duration_buf, opts);
+	get_duration_buf(afhi->seconds_total, duration_buf,
+		sizeof(duration_buf), opts);
 	if (opts->mode == LS_MODE_LONG) {
 		struct ls_widths *w = &opts->widths;
 		if (lls_opt_given(r_a))
@@ -1020,7 +1024,14 @@ out:
 /**
  * Open the audio file with highest score and set up an afd structure.
  *
- * \param afd Result pointer.
+ * This determines and opens the next audio file, verifies that it did not
+ * change by comparing the recomputed the hash value of the file contents
+ * against the value stored in the audio file table. If all goes well, it
+ * creates a shared memory area containing the serialized version of the afd
+ * structure, including the chunk table, if any. The caller can then send the
+ * ID of this area and the open fd to the server process.
+ *
+ * \param fd Result pointer for the file descriptor of the audio file.
  *
  * On success, the numplayed field of the audio file selector info is increased
  * and the lastplayed time is set to the current time. Finally, the score of
@@ -1028,7 +1039,7 @@ out:
  *
  * \return Positive shmid on success, negative on errors.
  */
-int open_and_update_audio_file(struct audio_file_data *afd)
+int open_and_update_audio_file(int *fd)
 {
 	unsigned char file_hash[HASH_SIZE];
 	struct osl_object afsi_obj;
@@ -1038,6 +1049,7 @@ int open_and_update_audio_file(struct audio_file_data *afd)
 	struct osl_object map, chunk_table_obj;
 	struct ls_data *d = &status_item_ls_data;
 	unsigned char *tmp_hash;
+	struct audio_file_data afd;
 again:
 	ret = score_get_best(&current_aft_row, &d->score);
 	if (ret < 0)
@@ -1070,11 +1082,11 @@ again:
 	ret = load_afsi(&d->afsi, &afsi_obj);
 	if (ret < 0)
 		return ret;
-	ret = get_afhi_of_row(current_aft_row, &afd->afhi);
+	ret = get_afhi_of_row(current_aft_row, &afd.afhi);
 	if (ret < 0)
 		return ret;
-	d->afhi = afd->afhi;
-	d->afhi.chunk_table = afd->afhi.chunk_table = NULL;
+	d->afhi = afd.afhi;
+	d->afhi.chunk_table = afd.afhi.chunk_table = NULL;
 	ret = osl(osl_open_disk_object(audio_file_table, current_aft_row,
 		AFTCOL_CHUNKS, &chunk_table_obj));
 	if (ret < 0) {
@@ -1086,7 +1098,7 @@ again:
 	} else {
 		PARA_INFO_LOG("chunk table: %zu bytes\n", chunk_table_obj.size);
 	}
-	ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, &afd->fd);
+	ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, fd);
 	if (ret < 0)
 		goto out;
 	hash_function(map.data, map.size, file_hash);
@@ -1101,8 +1113,8 @@ again:
 	new_afsi.last_played = time(NULL);
 	save_afsi(&new_afsi, &afsi_obj); /* in-place update */
 
-	afd->audio_format_id = d->afsi.audio_format_id;
-	load_chunk_table(&afd->afhi, &chunk_table_obj);
+	afd.audio_format_id = d->afsi.audio_format_id;
+	load_chunk_table(&afd.afhi, &chunk_table_obj);
 	aced.aft_row = current_aft_row;
 	aced.old_afsi = &d->afsi;
 	/*
@@ -1112,9 +1124,9 @@ again:
 	ret = afs_event(AFSI_CHANGE, NULL, &aced);
 	if (ret < 0)
 		goto out;
-	ret = save_afd(afd);
+	ret = save_afd(&afd);
 out:
-	free(afd->afhi.chunk_table);
+	free(afd.afhi.chunk_table);
 	if (chunk_table_obj.data)
 		osl_close_disk_object(&chunk_table_obj);
 	if (ret < 0) {