X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=36c432e54546d7f6079f9eb0ea4b35b675ab806b;hp=3881955d3ff14c757eef89a6330ccb95133cb09f;hb=7eaf2faf618705c97c77750371e177108aaa5897;hpb=9d75ded33ce6664156acb07e311f51d55970bbea

diff --git a/afh.c b/afh.c
index 3881955d..36c432e5 100644
--- a/afh.c
+++ b/afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -17,12 +17,105 @@
 #include "version.h"
 #include "ggo.h"
 
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
+
 static struct afh_args_info conf;
-INIT_AFH_ERRLISTS;
 
 static int loglevel;
 INIT_STDERR_LOGGING(loglevel)
 
+static inline bool tag_needs_update(bool given, const char *tag,
+		const char *arg)
+{
+	return given && (!tag || strcmp(tag, arg) != 0);
+}
+
+static int rewrite_tags(const char *name, int input_fd, void *map,
+		size_t map_size, int audio_format_id, struct afh_info *afhi)
+{
+	struct taginfo *tags = &afhi->tags;
+	bool modified = false;
+	char *tmp_name;
+	int output_fd = -1, ret;
+	struct stat sb;
+
+	if (tag_needs_update(conf.year_given, tags->year, conf.year_arg)) {
+		free(tags->year);
+		tags->year = para_strdup(conf.year_arg);
+		modified = true;
+	}
+	if (tag_needs_update(conf.title_given, tags->title, conf.title_arg)) {
+		free(tags->title);
+		tags->title = para_strdup(conf.title_arg);
+		modified = true;
+	}
+	if (tag_needs_update(conf.artist_given, tags->artist,
+			conf.artist_arg)) {
+		free(tags->artist);
+		tags->artist = para_strdup(conf.artist_arg);
+		modified = true;
+	}
+	if (tag_needs_update(conf.album_given, tags->album, conf.album_arg)) {
+		free(tags->album);
+		tags->album = para_strdup(conf.album_arg);
+		modified = true;
+	}
+	if (tag_needs_update(conf.comment_given, tags->comment,
+			conf.comment_arg)) {
+		free(tags->comment);
+		tags->comment = para_strdup(conf.comment_arg);
+		modified = true;
+	}
+	if (!modified) {
+		PARA_WARNING_LOG("no modifications necessary\n");
+		return 0;
+	}
+	/*
+	 * mkstmp() creates the temporary file with permissions 0600, but we
+	 * like it to have the same permissions as the original file, so we
+	 * have to get this information.
+	 */
+	if (fstat(input_fd, &sb) < 0) {
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		PARA_ERROR_LOG("failed to fstat fd %d (%s)\n", input_fd, name);
+		return ret;
+	}
+	tmp_name = make_message("%s.XXXXXX", name);
+	ret = mkstemp(tmp_name);
+	if (ret < 0) {
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		PARA_ERROR_LOG("could not create temporary file\n");
+		goto out;
+	}
+	output_fd = ret;
+	if (fchmod(output_fd, sb.st_mode) < 0) {
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		PARA_ERROR_LOG("failed to fchmod fd %d (%s)\n", output_fd,
+			tmp_name);
+		goto out;
+	}
+	ret = afh_rewrite_tags(audio_format_id, map, map_size, tags, output_fd,
+		tmp_name);
+	if (ret < 0)
+		goto out;
+	if (conf.backup_given) {
+		char *backup_name = make_message("%s~", name);
+		ret = xrename(name, backup_name);
+		free(backup_name);
+		if (ret < 0)
+			goto out;
+	}
+	ret = xrename(tmp_name, name);
+out:
+	if (ret < 0 && output_fd >= 0)
+		unlink(tmp_name); /* ignore errors */
+	free(tmp_name);
+	if (output_fd >= 0)
+		close(output_fd);
+	return ret;
+}
+
 static void print_info(int audio_format_num, struct afh_info *afhi)
 {
 	char *msg;
@@ -78,7 +171,7 @@ __noreturn static void print_help_and_die(void)
  */
 int main(int argc, char **argv)
 {
-	int i, ret, audio_format_num, fd;
+	int i, ret = 0, audio_format_num, fd;
 	void *audio_file_data;
 	size_t audio_file_size;
 	struct afh_info afhi;
@@ -86,13 +179,9 @@ int main(int argc, char **argv)
 	afh_cmdline_parser(argc, argv, &conf);
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	version_handle_flag("afh", conf.version_given);
-	if (conf.help_given || conf.detailed_help_given)
+	if (conf.help_given || conf.detailed_help_given || conf.inputs_num == 0)
 		print_help_and_die();
 	afh_init();
-	ret = -E_AFH_SYNTAX;
-	if (conf.inputs_num == 0)
-		goto out;
-	afh_init();
 	for (i = 0; i < conf.inputs_num; i++) {
 		int ret2;
 		ret = mmap_full_file(conf.inputs[i], O_RDONLY, &audio_file_data,
@@ -103,16 +192,21 @@ int main(int argc, char **argv)
 		}
 		ret = compute_afhi(conf.inputs[i], audio_file_data, audio_file_size,
 			fd, &afhi);
-		if (ret < 0)
-			goto out;
-
-		audio_format_num = ret;
-		printf("File %d: %s\n", i + 1, conf.inputs[i]);
-		print_info(audio_format_num, &afhi);
-		if (conf.chunk_table_given)
-			print_chunk_table(&afhi);
-		printf("\n");
-		clear_afhi(&afhi);
+		if (ret >= 0) {
+			audio_format_num = ret;
+			if (conf.modify_given) {
+				ret = rewrite_tags(conf.inputs[i], fd, audio_file_data,
+					audio_file_size, audio_format_num, &afhi);
+			} else {
+				printf("File %d: %s\n", i + 1, conf.inputs[i]);
+				print_info(audio_format_num, &afhi);
+				if (conf.chunk_table_given)
+					print_chunk_table(&afhi);
+				printf("\n");
+			}
+			clear_afhi(&afhi);
+		}
+		close(fd);
 		ret2 = para_munmap(audio_file_data, audio_file_size);
 		if (ret2 < 0 && ret >= 0)
 			ret = ret2;