From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 7 03:50:07 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEC0F16A4CE for ; Sun, 7 Mar 2004 03:50:06 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6C2543D53 for ; Sun, 7 Mar 2004 03:50:06 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i27Bo6bv037180 for ; Sun, 7 Mar 2004 03:50:06 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i27Bo6Zd037179; Sun, 7 Mar 2004 03:50:06 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 7 Mar 2004 03:50:06 -0800 (PST) Resent-Message-Id: <200403071150.i27Bo6Zd037179@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, "Jose R.Rey" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A65516A4CE for ; Sun, 7 Mar 2004 03:43:48 -0800 (PST) Received: from main.v2project.com (cliente-212079143235.cm256.senpc.supercable.es [212.79.143.235]) by mx1.FreeBSD.org (Postfix) with ESMTP id E62F243D2D for ; Sun, 7 Mar 2004 03:43:47 -0800 (PST) (envelope-from king@main.v2project.com) Received: by main.v2project.com (Postfix, from userid 1001) id 4DDD06D4549; Sun, 7 Mar 2004 11:43:46 +0000 (GMT) Message-Id: <20040307114346.4DDD06D4549@main.v2project.com> Date: Sun, 7 Mar 2004 11:43:46 +0000 (GMT) From: "Jose R.Rey" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/63869: Port update: net/xbms X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Jose R.Rey" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Mar 2004 11:50:07 -0000 >Number: 63869 >Category: ports >Synopsis: Port update: net/xbms >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Mar 07 03:50:06 PST 2004 >Closed-Date: >Last-Modified: >Originator: Jose R.Rey >Release: FreeBSD 5.1-RELEASE-p13 i386 >Organization: MG >Environment: System: >Description: Update patch files for XBMC compatibility, >How-To-Repeat: >Fix: --- xbms-0.30.6.patch begins here --- diff -ru xbms.orig/files/patch-server xbms/files/patch-server --- xbms.orig/files/patch-server Tue Oct 7 09:36:10 2003 +++ xbms/files/patch-server Sun Mar 7 12:30:36 2004 @@ -1,11 +1,63 @@ ---- server.c.orig Fri Dec 20 00:00:41 2002 -+++ server.c Fri Dec 20 00:00:55 2002 +--- server.c.orig Sun Feb 23 13:12:06 2003 ++++ server.c Sun Mar 7 12:30:02 2004 @@ -55,7 +55,7 @@ - #define VERSION "0.30.5" + #define VERSION "0.30.6-dev" -#define CONFIG "/etc/xbms.conf" +#define CONFIG "@@PREFIX@@/etc/xbms.conf" #define PIDFILE "/var/run/xbms.pid" #define C_SERVER_PORT 1400 #define MAX_MSG_LENGTH 4096 +@@ -465,9 +465,10 @@ + if (main_config->debug_lvl >= 1) d_log("OPEN\n"); + + /* Get the argument after comma */ +- ptr = strtok(line,","); +- ptr = strtok(NULL,","); +- ++ ptr = strstr(line,","); ++// ptr = strtok(NULL,","); ++ if (ptr!=NULL) { ++ ptr++; + fileName = (char *)malloc(strlen(ptr)+1); + // targetfileName = (char *)malloc(strlen(TARGET_PATH)+strlen(ptr)+2); + +@@ -508,7 +509,8 @@ + } + } + else d_log("Illegal string in filename: %s\n", fileName); +- } ++ } else d_log("Illegal filename: %s\n", fileName); ++ } + + /***************************** READ A PART OF A FILE ****************/ + if (strcmp(cmd,"READ") == 0) +@@ -632,13 +634,14 @@ + /* mp3 playlists work from now on */ + if (strcmp(cmd,"*CAT") == 0) { + if (main_config->debug_lvl >= 5) +- d_log("CurDirectory: %s\n",main_config->current_path); ++ d_log("CurDirectory: %s\n",main_config->root_dir); + + /* Get the character after the comma, if any */ +- ptr = strtok(line,","); +- if ((ptr = strtok(NULL,","))) { ++ ptr = strstr(line,","); ++ if (ptr!=NULL) { + /* Check the command */ +- if (!strcmp(ptr,"BACK")) { ++ ptr++; ++ if (!strcmp(ptr,"BACK")) { + /* We can't go back if the current path is empty ! */ + if (main_config->current_path!=NULL && main_config->current_path[0] != 0) { + fileName = (char *)malloc(strlen(main_config->current_path)+1); +@@ -654,7 +657,7 @@ + if (main_config->current_path!=NULL) free(main_config->current_path); + main_config->current_path=strdup(ptr); + } +- } ++ } else {main_config->current_path=NULL;} + + if (main_config->debug_lvl >= 5) + d_log("targetpath: %s - curpath: %s - ptr: %s\n",TARGET_PATH,main_config->current_path,ptr); --- xbms-0.30.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: