Improve scripting, implement v1->v2 conversion, implement --delete command.

* libid3tag/file.c (v2_write): Change for make it possible to
convert v1 to v2.
* src/.gitignore: Add guile.x.
* src/Makefile.am (idest_SOURCES): Add guile.x
(BUILT_SOURCES): Add guile.x
(SUFFIXES): Add .x
(.c.x): New rule
* src/cmdline.opt: New option: --trace.
* src/guile.c: Rewrite.
* src/idest.h (MODE_QUERY, MODE_MOD, MODE_DELETE): New defines (from main.c).
(guile_transform, guile_list): New protos.
(guile_apply): Remove.
* src/idop.c (set_tags): Handle convert_version == 2.
(del_tags): New function.
* src/main.c (del_id3): Call del_tags

1 files changed, 10 insertions, 10 deletions

diff --git a/libid3tag/file.c b/libid3tag/file.c
index 5ad025b..9210571 100644
--- a/libid3tag/file.c
+++ b/libid3tag/file.c
@@ -701,23 +701,23 @@ int v2_write(struct id3_file *file,
       return -1;
     
     tmp = make_temp_file(file, &tmpname);
     if (!tmp)
       return -1;
 
-    rc = copy_block(file->iofile, tmp, 0, file->tags[0].location);
-    if (rc == 0) {
-      if (data && length)
-	rc = fwrite(data, length, 1, tmp) != 1;
-      else
-	rc = 0;
+    if (data && length)
+      rc = fwrite(data, length, 1, tmp) != 1;
+    else
+      rc = 0;
       
-      if (rc == 0)
-	rc = copy_block(file->iofile, tmp,
-			file->tags[0].location + file->tags[0].length, -1);
-    }
+    if (rc == 0) 
+      rc = copy_block(file->iofile, tmp,
+		      /* FIXME: Should I check tag->version instead? */
+		      (file->tags[0].location == 0) ?
+		         file->tags[0].length : 0, -1);
+
     fclose(tmp);
     if (rc) 
       unlink(tmpname);
     else {      
       file->tags[0].length = length;
       fclose(file->iofile);