r17641 - in /desktop/experimental/esound/debian: changelog patches/09_spawn_nobeeps.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Nov 18 17:50:05 2008
New Revision: 17641

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17641
Log:
09_spawn_nobeeps.patch: initialize spawnfd as -1, and check for its 
being >=0, since 0 is a perfectly valid spawnfd.

Modified:
    desktop/experimental/esound/debian/changelog
    desktop/experimental/esound/debian/patches/09_spawn_nobeeps.patch

Modified: desktop/experimental/esound/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/changelog?rev=17641&op=diff
==============================================================================
--- desktop/experimental/esound/debian/changelog (original)
+++ desktop/experimental/esound/debian/changelog Tue Nov 18 17:50:05 2008
@@ -1,3 +1,10 @@
+esound (0.2.40-2) UNRELEASED; urgency=low
+
+  * 09_spawn_nobeeps.patch: initialize spawnfd as -1, and check for its 
+    being >=0, since 0 is a perfectly valid spawnfd.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 18 Nov 2008 18:42:59 +0100
+
 esound (0.2.40-1) experimental; urgency=low
 
   * New maintainer.

Modified: desktop/experimental/esound/debian/patches/09_spawn_nobeeps.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/patches/09_spawn_nobeeps.patch?rev=17641&op=diff
==============================================================================
--- desktop/experimental/esound/debian/patches/09_spawn_nobeeps.patch (original)
+++ desktop/experimental/esound/debian/patches/09_spawn_nobeeps.patch Tue Nov 18 17:50:05 2008
@@ -1,13 +1,58 @@
 Index: esound-0.2.40/esd.c
 ===================================================================
---- esound-0.2.40.orig/esd.c	2008-11-15 04:58:08.000000000 +0100
-+++ esound-0.2.40/esd.c	2008-11-15 04:58:27.000000000 +0100
-@@ -983,7 +983,7 @@
+--- esound-0.2.40.orig/esd.c	2008-11-18 18:41:55.851266013 +0100
++++ esound-0.2.40/esd.c	2008-11-18 18:49:50.461810369 +0100
+@@ -103,7 +103,7 @@ int esd_use_tcpip = 0;          /* use t
+ int esd_terminate = 0;          /* terminate after the last client exits */
+ int esd_public = 0;             /* allow connects from hosts other than localhost */
+ int esd_spawnpid = 0;           /* The PID of the process that spawned us (for use by esdlib only) */
+-int esd_spawnfd = 0;            /* The FD of the process that spawned us (for use by esdlib only) */
++int esd_spawnfd = -1;           /* The FD of the process that spawned us (for use by esdlib only) */
+ 
+ #if defined ENABLE_IPV6        
+ int esd_use_ipv6 = 0;          /* We need it in accept () to know if we use 
+@@ -786,7 +786,7 @@ int main ( int argc, char *argv[] )
+ 		esd_spawnpid = atoi( opts[ arg ] );
+ 	} else if ( !strcmp( opts[ arg ], "-spawnfd" ) ) {
+ 	    if ( ++arg < num_opts )
+-		esd_spawnfd = atoi( opts[ arg ] );
++		sscanf ( opts [ arg ], "%i", &esd_spawnfd);
+ 	} else if ( !strcmp( opts[ arg ], "-trust" ) ) {
+ 	    esd_trustval = 0;
+ 	} else if ( !strcmp( opts[ arg ], "-v" ) || !strcmp( opts[ arg ], "--version" ) ) {
+@@ -869,7 +869,7 @@ int main ( int argc, char *argv[] )
+     if(esd_spawnpid)
+       kill(esd_spawnpid, SIGTERM); /* Startup failed */
+     
+-    if(esd_spawnfd) {
++    if(esd_spawnfd >= 0) {
+ 	char c = 0; /* Startup failed */
+ 	write (esd_spawnfd, &c, 1);
+     }
+@@ -953,7 +953,7 @@ int main ( int argc, char *argv[] )
+ 		    if(esd_spawnpid)
+ 		      kill(esd_spawnpid, SIGTERM); /* Startup failed */
+ 
+-		    if(esd_spawnfd) {
++		    if(esd_spawnfd >= 0) {
+ 			char c = 0; /* Startup failed */
+ 			write (esd_spawnfd, &c, 1);
+ 		    }
+@@ -983,7 +983,7 @@ int main ( int argc, char *argv[] )
  
      /* send some sine waves just to check the sound connection */
      i = 0;
 -    if ( esd_beeps ) {
-+    if ( !esd_spawnfd && esd_beeps ) {
++    if ( esd_spawnfd >= 0 && esd_beeps ) {
  	magl = magr = ( (esd_audio_format & ESD_MASK_BITS) == ESD_BITS16)
  	    ? 30000 : 100;
  
+@@ -1009,7 +1009,7 @@ int main ( int argc, char *argv[] )
+     if(esd_spawnpid)
+       kill(esd_spawnpid, SIGUSR1);
+ 
+-    if(esd_spawnfd) {
++    if(esd_spawnfd >= 0) {
+ 	char c = 1; /* Startup succeeded */
+ 	write (esd_spawnfd, &c, 1);
+     }