From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Feb 20 22:00:15 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7A15316B2D8 for ; Tue, 20 Feb 2007 22:00:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 5BDAE13C46B for ; Tue, 20 Feb 2007 22:00:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l1KM0FJp090048 for ; Tue, 20 Feb 2007 22:00:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1KM0F9v090046; Tue, 20 Feb 2007 22:00:15 GMT (envelope-from gnats) Resent-Date: Tue, 20 Feb 2007 22:00:15 GMT Resent-Message-Id: <200702202200.l1KM0F9v090046@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, trasz Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6C15116CA46 for ; Tue, 20 Feb 2007 21:51:37 +0000 (UTC) (envelope-from trasz@pin.if.uz.zgora.pl) Received: from pin.if.uz.zgora.pl (pin.if.uz.zgora.pl [212.109.128.251]) by mx1.freebsd.org (Postfix) with ESMTP id 5A03A13C6D5 for ; Tue, 20 Feb 2007 21:49:35 +0000 (UTC) (envelope-from trasz@pin.if.uz.zgora.pl) Received: by pin.if.uz.zgora.pl (Postfix, from userid 1001) id 12F7939DBD; Tue, 20 Feb 2007 22:55:47 +0100 (CET) Message-Id: <20070220215547.12F7939DBD@pin.if.uz.zgora.pl> Date: Tue, 20 Feb 2007 22:55:47 +0100 (CET) From: trasz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/109374: [PATCH] audio/umix: fix display. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Feb 2007 22:00:15 -0000 >Number: 109374 >Category: ports >Synopsis: [PATCH] audio/umix: fix display. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 20 22:00:14 GMT 2007 >Closed-Date: >Last-Modified: >Originator: trasz >Release: FreeBSD 6.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006 >Description: Do not try to display unitialised string. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- umix-1.0.2_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/audio/umix/files/patch-src::driver_oss.c /home/trasz/umix/files/patch-src::driver_oss.c --- /usr/ports/audio/umix/files/patch-src::driver_oss.c Thu Jan 11 08:42:14 2007 +++ /home/trasz/umix/files/patch-src::driver_oss.c Tue Feb 20 22:53:27 2007 @@ -1,5 +1,5 @@ ---- src/driver_oss.c.orig Sun Aug 31 22:32:02 2003 -+++ src/driver_oss.c Thu Nov 6 01:22:48 2003 +--- src/driver_oss.c.orig Sun Aug 31 15:32:02 2003 ++++ src/driver_oss.c Tue Feb 20 22:44:43 2007 @@ -27,7 +27,7 @@ #if defined(__linux__) #include @@ -20,7 +20,7 @@ int old_mixer; int ch; int i; -@@ -288,9 +290,11 @@ +@@ -288,9 +290,13 @@ mixer_ptr->numchan = SOUND_MIXER_NRDEVICES; mixer_ptr->numchan = CLAMP(mixer_ptr->numchan,0,SOUND_MIXER_NRDEVICES); @@ -28,11 +28,13 @@ /* get the mixer name */ eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); strncpy(mixer_ptr->name, oss_info.name, sizeof(mixer_ptr->name)); ++#else ++ strncpy(mixer_ptr->name, "", 1); +#endif mixer_ptr->curr_chan = 0; #ifdef UMIX_DEBUG -@@ -329,9 +333,11 @@ +@@ -329,9 +335,11 @@ oss_set_curr_chan(i); oss_update(OSS_UPD_READ); } @@ -44,7 +46,7 @@ #ifdef UMIX_DEBUG err_msg("oss_init: initialized #%d with %d channels", -@@ -388,6 +394,7 @@ +@@ -388,6 +396,7 @@ * the device and compares it to the old */ static int oss_check_update(void) { @@ -52,7 +54,7 @@ struct mixer_info oss_info; eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); -@@ -396,6 +403,7 @@ +@@ -396,6 +405,7 @@ mixer_ptr->modifycount = oss_info.modify_counter; return 1; } --- umix-1.0.2_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: