Update mserv to 0.35nb2:

	Fix six variations on the same file descriptor leak theme

3 files changed, 48 insertions, 7 deletions

diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile
index f26c5fcacd4..c7b00a459b6 100644
--- a/audio/mserv/Makefile
+++ b/audio/mserv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/09/03 19:55:25 abs Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/04 18:32:45 abs Exp $
 #
 
 DISTNAME=	mserv-0.35
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mserv.org/download/
 
diff --git a/audio/mserv/distinfo b/audio/mserv/distinfo
index 7966c37a32d..0d977e9ea7e 100644
--- a/audio/mserv/distinfo
+++ b/audio/mserv/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2003/09/03 19:55:26 abs Exp $
+$NetBSD: distinfo,v 1.13 2003/09/04 18:32:45 abs Exp $
 
 SHA1 (mserv-0.35.tar.gz) = 850835946e4d5a0deccdd22a18f30170c0a7b57c
 Size (mserv-0.35.tar.gz) = 280299 bytes
 SHA1 (patch-aa) = 22bb3f2af2494e50456c9b1bf136774b3b300aae
 SHA1 (patch-ab) = 9d1b9fe0ee1b5392e2249b50d3e27426b17c9c04
-SHA1 (patch-ac) = 41d542c783cbc969afc931b0149edc5c90675b51
+SHA1 (patch-ac) = ed75495c6e076c8db2b9320e1134b67cf4d65687
 SHA1 (patch-af) = 2839b8e0c51a4c1c182173abc1c406b66a915ac4
 SHA1 (patch-ag) = 232ce715468e8a59820b856a586dc708d65a2b5e
 SHA1 (patch-am) = 925a304562d89c3aca32a3f07f00eab912e8d2dd
diff --git a/audio/mserv/patches/patch-ac b/audio/mserv/patches/patch-ac
index be6de327900..d0553dd0e48 100644
--- a/audio/mserv/patches/patch-ac
+++ b/audio/mserv/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2003/09/03 19:55:28 abs Exp $
+$NetBSD: patch-ac,v 1.7 2003/09/04 18:32:46 abs Exp $
 
 --- mserv/mserv.c.orig	Sun Aug  3 15:57:20 2003
 +++ mserv/mserv.c
@@ -21,7 +21,48 @@ $NetBSD: patch-ac,v 1.6 2003/09/03 19:55:28 abs Exp $
  #include "defconf.h"
  #include "conf.h"
  #include "opt.h"
-@@ -2098,8 +2103,17 @@ static t_track *mserv_loadtrk(const char
+@@ -2019,11 +2024,13 @@ static t_track *mserv_loadtrk(const char
+       alen = strlen(buffer);
+       if (buffer[alen-1] != '\n') {
+ 	mserv_log("Line %d too long in '%s'", line, fullpath_trk);
++	fclose(fd);
+ 	return NULL;
+       }
+       buffer[--alen] = '\0';
+       if (!(l = strcspn(buffer, "=")) || l >= 64) {
+ 	mserv_log("Invalid track line %d in '%s'", line, fullpath_trk);
++	fclose(fd);
+ 	return NULL;
+       }
+       strncpy(token, buffer, l);
+@@ -2059,6 +2066,7 @@ static t_track *mserv_loadtrk(const char
+ 	}
+ 	if ((arate = malloc(sizeof(t_rating)+strlen(token)+1)) == NULL) {
+ 	  mserv_log("Out of memory creating ratings for '%s'", fullpath_trk);
++	  fclose(fd);
+ 	  return NULL;
+ 	}
+ 	memset(arate, 0, sizeof(t_rating));
+@@ -2082,15 +2090,18 @@ static t_track *mserv_loadtrk(const char
+     }
+     if (!*author) {
+       mserv_log("No author specified in '%s'", fullpath_trk);
++      fclose(fd);
+       return NULL;
+     }
+     if (!*name) {
+       mserv_log("No name specified in '%s'", fullpath_trk);
++      fclose(fd);
+       return NULL;
+     }
+     if (fstat(fileno(fd), &buf) == -1) {
+       perror("fstat");
+       mserv_log("Unable to stat '%s': %s", filename, strerror(errno));
++      fclose(fd);
+       return NULL;
+     }
+     mtime = buf.st_mtime;
+@@ -2098,8 +2109,17 @@ static t_track *mserv_loadtrk(const char
    }
    if (duration == 0 && !*miscinfo) {
      len = strlen(fullpath_file);
@@ -39,7 +80,7 @@ $NetBSD: patch-ac,v 1.6 2003/09/03 19:55:28 abs Exp $
        if (duration == -1) {
  	mserv_log("Unable to determine details of mp3 '%s': %s",
  		  filename, strerror(errno));
-@@ -3427,6 +3441,62 @@ int mserv_setmixer(t_client *cl, int wha
+@@ -3427,6 +3447,62 @@ int mserv_setmixer(t_client *cl, int wha
    close(mixer_fd);
    mserv_response(cl, "NAN", NULL);
    return -1;