r58 - in trunk/packages/vorbis-tools/debian: . patches

[Clint Adams]

Author: schizo
Date: 2006-03-27 02:15:01 +0000 (Mon, 27 Mar 2006)
New Revision: 58

Added:
   trunk/packages/vorbis-tools/debian/patches/upstream_r10091-ogg123_return_error.diff
Modified:
   trunk/packages/vorbis-tools/debian/changelog
   trunk/packages/vorbis-tools/debian/patches/series
Log:
  * Fix ogg123 returning 0 on corrupted file.  closes: #193349.
    [File: upstream_r10091-ogg123_return_error.diff]


Modified: trunk/packages/vorbis-tools/debian/changelog
===================================================================
--- trunk/packages/vorbis-tools/debian/changelog	2006-03-27 01:26:53 UTC (rev 57)
+++ trunk/packages/vorbis-tools/debian/changelog	2006-03-27 02:15:01 UTC (rev 58)
@@ -2,6 +2,8 @@
 
   * Fix additional oggenc man page typos with patch from A Costa.
     closes: #353186.
+  * Fix ogg123 returning 0 on corrupted file.  closes: #193349.
+    [File: upstream_r10091-ogg123_return_error.diff]
 
  -- Clint Adams <schizo at debian.org>  Sun, 26 Mar 2006 20:11:50 -0500
 

Modified: trunk/packages/vorbis-tools/debian/patches/series
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/series	2006-03-27 01:26:53 UTC (rev 57)
+++ trunk/packages/vorbis-tools/debian/patches/series	2006-03-27 02:15:01 UTC (rev 58)
@@ -10,3 +10,4 @@
 for_upstream-encodage_vs_codage_in_fr.po.diff
 no_debian_subdir.diff
 no_fast-math.diff
+upstream_r10091-ogg123_return_error.diff

Added: trunk/packages/vorbis-tools/debian/patches/upstream_r10091-ogg123_return_error.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/upstream_r10091-ogg123_return_error.diff	2006-03-27 01:26:53 UTC (rev 57)
+++ trunk/packages/vorbis-tools/debian/patches/upstream_r10091-ogg123_return_error.diff	2006-03-27 02:15:01 UTC (rev 58)
@@ -0,0 +1,61 @@
+Index: vorbis-tools-1.1.1/ogg123/ogg123.c
+===================================================================
+--- vorbis-tools-1.1.1.orig/ogg123/ogg123.c	2005-06-03 06:15:09.000000000 -0400
++++ vorbis-tools-1.1.1/ogg123/ogg123.c	2006-03-26 21:11:27.258936569 -0500
+@@ -46,6 +46,7 @@
+ #include "ogg123.h"
+ #include "i18n.h"
+ 
++extern int exit_status; /* from status.c */
+ 
+ void exit_cleanup ();
+ void play (char *source_string);
+@@ -396,10 +397,9 @@
+ 
+   playlist_array_destroy(playlist_array, items);
+ 
+-  exit (0);
++  exit (exit_status);
+ }
+ 
+-
+ void play (char *source_string)
+ {
+   transport_t *transport;
+@@ -615,7 +615,7 @@
+   status_message(1, _("Done."));
+   
+   if (sig_request.exit)
+-    exit (0);
++    exit (exit_status);
+ }
+ 
+ 
+Index: vorbis-tools-1.1.1/ogg123/status.c
+===================================================================
+--- vorbis-tools-1.1.1.orig/ogg123/status.c	2005-06-03 06:15:09.000000000 -0400
++++ vorbis-tools-1.1.1/ogg123/status.c	2006-03-26 21:11:27.262936964 -0500
+@@ -25,6 +25,7 @@
+ char temp_buffer[200];
+ int last_line_len = 0;
+ int max_verbosity = 0;
++int exit_status = EXIT_SUCCESS;
+ 
+ pthread_mutex_t output_lock = PTHREAD_MUTEX_INITIALIZER;
+ 
+@@ -449,6 +450,8 @@
+   pthread_mutex_unlock(&output_lock);
+ 
+   pthread_cleanup_pop(0);
++
++  exit_status = EXIT_FAILURE;
+ }
+ 
+ 
+@@ -462,4 +465,6 @@
+   pthread_mutex_unlock(&output_lock);
+ 
+   pthread_cleanup_pop(0);
++
++  exit_status = EXIT_FAILURE;
+ }