1 files changed, 38 insertions, 14 deletions
diff --git a/audio/mserv/patches/patch-ak b/audio/mserv/patches/patch-ak
index cbc9052e451..5db691ee103 100644
--- a/audio/mserv/patches/patch-ak
+++ b/audio/mserv/patches/patch-ak
@@ -1,15 +1,39 @@
-$NetBSD: patch-ak,v 1.1 2002/08/02 23:01:48 abs Exp $
+$NetBSD: patch-ak,v 1.2 2002/10/03 15:46:58 abs Exp $
 
---- mserv/opt.c.orig	Thu Jul 13 22:14:41 2000
-+++ mserv/opt.c
-@@ -164,8 +164,8 @@ int opt_read(const char *root)
-   /* special case - player variable is an indirected to another variable */
-   if ((val = conf_getvalue("player")) == NULL) {
-     if (mserv_verbose)
--      printf("No player specified, defaulting to /usr/local/bin/mpg123\n");
--    opt_player = "/usr/local/bin/mpg123";
-+      printf("No player specified, defaulting to " PATH_MPG123 "\n");
-+    opt_player = PATH_MPG123;
-   } else {
-     if ((opt_player = conf_getvalue(val)) == NULL) {
-       fprintf(stderr, "%s: player setting '%s' not found\n", progname,
+--- mserv/mserv.c.orig	Sat Jul 15 18:01:15 2000
++++ mserv/mserv.c
+@@ -2098,13 +2098,13 @@ static t_track *mserv_loadtrk(const char
+       } else {
+ 	if (id3tag.present) {
+ 	  if (newinfofile) {
+-	    strncpy(author, id3tag.artist, AUTHORLEN);
+-	    author[AUTHORLEN] = '\0';
+-	    strncpy(name, id3tag.title, NAMELEN);
+-	    name[NAMELEN] = '\0';
++	    strncpy(author, id3tag.artist, sizeof(id3tag.artist) - 1);
++	    author[sizeof(id3tag.artist) - 1] = '\0';
++	    strncpy(name, id3tag.title, sizeof(id3tag.title) - 1);
++	    name[sizeof(id3tag.title) - 1] = '\0';
+ 	    year = atoi(id3tag.year);
+-	    strncpy(genres, id3tag.genre, GENRESLEN);
+-	    genres[GENRESLEN] = '\0';
++	    strncpy(genres, id3tag.genre, sizeof(id3tag.genre) - 1);
++	    genres[sizeof(id3tag.genre) - 1] = '\0';
+ 	    mserv_strtoprintable(author);
+ 	    mserv_strtoprintable(name);
+ 	    mserv_strtoprintable(genres);
+@@ -3370,7 +3370,13 @@ int mserv_setmixer(t_client *cl, int wha
+ 	mserv_response(cl, "IOCTLWR", NULL);
+ 	return -1;
+       }
+-      newval = newval & 0xFF;
++      if (ioctl(mixer_fd, MIXER_READ(what), &newval) == -1) {
++        close(mixer_fd);
++        perror("iotcl read");
++        mserv_response(cl, "IOCTLRD", 0);
++        return -1;
++      }
++      newval = newval & 0xff;
+       if (type == 0 || newval != curval)
+ 	break;
+       param++;