Fix errno usage.

4 files changed, 50 insertions, 13 deletions

diff --git a/audio/liveice/distinfo b/audio/liveice/distinfo
index 6d7a15d0fde..3eb528780c7 100644
--- a/audio/liveice/distinfo
+++ b/audio/liveice/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:48 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/12/11 22:24:03 joerg Exp $
 
 SHA1 (liveice-0.20001121/liveice.tar.gz) = 029657129e98d837e3c978885cfb52772d4551c9
 RMD160 (liveice-0.20001121/liveice.tar.gz) = 5739b4e92e17d4d6288573eee257a4fc07a612a8
 Size (liveice-0.20001121/liveice.tar.gz) = 85171 bytes
 SHA1 (patch-aa) = 367d7fa0b9cc20420814dad2db398a0f84b04982
-SHA1 (patch-ab) = ced8f48ce395f93d7322ef756feb28614664b7b5
+SHA1 (patch-ab) = 4306e08e1653100ddaa7ef5a7f40446dc1873191
 SHA1 (patch-ac) = 60963cab7c823e81170e64dfaee074845aa8f0cc
 SHA1 (patch-ad) = 0747e01148f1aa5fa72bc3262e3fbbd0c9118dca
 SHA1 (patch-ae) = 1b6655761340f2dc894f5f837e9b07d56584e470
@@ -12,3 +12,5 @@ SHA1 (patch-af) = 1eff5e733457accfeb298eb314cbaf21cbdecde0
 SHA1 (patch-ag) = afd356eb44cbfef37c32a2bc92bc3cea155b0a67
 SHA1 (patch-ah) = 58be03b1970f8ebe2f32936bef9c1989342aed2d
 SHA1 (patch-ai) = a8567695607ea92ad13fb404cb3899deb7330153
+SHA1 (patch-aj) = ac88b733f5a6f894e1a168e8c7930301ccd19fd2
+SHA1 (patch-ak) = 0c3803b0a90a18fa6564c25ee1975d5bafda31cf
diff --git a/audio/liveice/patches/patch-ab b/audio/liveice/patches/patch-ab
index 47e1660bc33..a6188052954 100644
--- a/audio/liveice/patches/patch-ab
+++ b/audio/liveice/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2001/05/05 10:05:34 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2005/12/11 22:24:03 joerg Exp $
 
---- streams.c.orig	Tue May 23 20:08:00 2000
+--- streams.c.orig	2000-05-23 18:08:00.000000000 +0000
 +++ streams.c
 @@ -36,7 +36,11 @@
  #ifdef HAVE_SYS_SOUNDCARD_H
@@ -14,7 +14,16 @@ $NetBSD: patch-ab,v 1.2 2001/05/05 10:05:34 wiz Exp $
  #endif
  #endif
  #include <sys/ioctl.h>
-@@ -77,11 +81,23 @@
+@@ -44,8 +48,6 @@
+ #define BUF_SIZE BUF_LENGTH*2
+ #define BUFLEN 1024*32
+ 
+-extern int errno;
+-
+ FILE *ds;
+ 
+ /* suggested legal sample rates */
+@@ -77,11 +79,23 @@ void check_soundcard(void)
  {
          int format,stereo,speed,caps;
  #ifdef SOUNDCARD_SUPPORT
@@ -38,12 +47,12 @@ $NetBSD: patch-ab,v 1.2 2001/05/05 10:05:34 wiz Exp $
          /* see if the card can do full_duplex */
          if(g_conf.full_duplex){
                  ioctl(g_conf.audio_fd, SNDCTL_DSP_GETCAPS, &caps);
-@@ -97,7 +113,33 @@
+@@ -97,7 +111,33 @@ void check_soundcard(void)
  			g_conf.full_duplex=0;
  		}
  	}
 +#endif /* __NetBSD__ */
- 
++
 +#ifdef __NetBSD__
 +	if(ioctl(g_conf.audioctl_fd, AUDIO_GETINFO, &(g_conf.ctlrestore)) < 0)
 +		fatal("ioctl(AUDIO_GETINFO) failed");
@@ -65,14 +74,14 @@ $NetBSD: patch-ab,v 1.2 2001/05/05 10:05:34 wiz Exp $
 +	ctlinfo.record.precision = 16;
 +	ctlinfo.record.encoding = AUDIO_ENCODING_SLINEAR_LE;
 +	ctlinfo.mode = AUMODE_RECORD;
-+
+ 
 +	if(ioctl(g_conf.audioctl_fd, AUDIO_SETINFO, &ctlinfo) < 0)
 +		fatal("ioctl(AUDIO_SETINFO) failed");
 +#else
  	ioctl(g_conf.audio_fd, SNDCTL_DSP_GETFMTS, &format);
  	if(!(format&AFMT_S16_LE))
  		fatal("16bit mode not supported by driver");
-@@ -113,6 +155,7 @@
+@@ -113,6 +153,7 @@ void check_soundcard(void)
  	speed=g_conf.sample_rate;
  	if(ioctl(g_conf.audio_fd,SNDCTL_DSP_SPEED,&speed)==-1)
  		fatal("Speed Setting failed\n");
@@ -80,7 +89,7 @@ $NetBSD: patch-ab,v 1.2 2001/05/05 10:05:34 wiz Exp $
  
  	
  	fprintf(stderr,"16Bit %dHz ",g_conf.sample_rate);
-@@ -121,8 +164,10 @@
+@@ -121,8 +162,10 @@ void check_soundcard(void)
  	if(g_conf.full_duplex)
  	 	  fprintf(stderr,"Full Duplex ");
  	fprintf(stderr,"\n");
@@ -91,7 +100,7 @@ $NetBSD: patch-ab,v 1.2 2001/05/05 10:05:34 wiz Exp $
  #else
  	write_message("This executable Doesn't Support Soundcards",0);
  #endif
-@@ -136,9 +181,10 @@
+@@ -136,9 +179,10 @@ void open_soundcard(int flags){
  #ifdef SOUNDCARD_SUPPORT
         write_message("Opening Soundcard",1);
          
@@ -103,7 +112,7 @@ $NetBSD: patch-ab,v 1.2 2001/05/05 10:05:34 wiz Exp $
          if(g_conf.full_duplex)
  #ifdef HAVE_SYS_SOUNDCARD_H
  	        ioctl(g_conf.audio_fd, SNDCTL_DSP_SETDUPLEX, 0);  
-@@ -157,6 +203,7 @@
+@@ -157,6 +201,7 @@ void open_soundcard(int flags){
  	speed=g_conf.sample_rate;
  	if(ioctl(g_conf.audio_fd,SNDCTL_DSP_SPEED,&speed)==-1)
  		fatal("Speed Setting failed\n");
@@ -111,7 +120,7 @@ $NetBSD: patch-ab,v 1.2 2001/05/05 10:05:34 wiz Exp $
  #else
  	write_message("This executable Doesn't Support Soundcards",0);
  #endif
-@@ -166,8 +213,21 @@
+@@ -166,8 +211,21 @@ void close_soundcard(void)
  {
  #ifdef SOUNDCARD_SUPPORT
  	write_message("Closing Soundcard",1);
diff --git a/audio/liveice/patches/patch-aj b/audio/liveice/patches/patch-aj
new file mode 100644
index 00000000000..ca13a35505c
--- /dev/null
+++ b/audio/liveice/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2005/12/11 22:24:03 joerg Exp $
+
+--- liveice.c.orig	2005-12-11 22:17:53.000000000 +0000
++++ liveice.c
+@@ -20,8 +20,6 @@
+ 
+ #include "liveice.h"
+ 
+-extern int errno;
+-
+ void kill_children(int signo) {
+ 	fprintf(stderr,"Killing children...\n");
+ 	if(killpg(0, SIGTERM) < 0) {
diff --git a/audio/liveice/patches/patch-ak b/audio/liveice/patches/patch-ak
new file mode 100644
index 00000000000..0023dea2ff9
--- /dev/null
+++ b/audio/liveice/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2005/12/11 22:24:03 joerg Exp $
+
+--- serverlib.c.orig	2005-12-11 22:17:16.000000000 +0000
++++ serverlib.c
+@@ -24,8 +24,6 @@
+ #include "liveice.h"
+ #include "serverlib.h"
+ 
+-extern int errno;
+-
+ 
+ 
+ /* Create a new socket which can be bound to a socket later */