From owner-freebsd-bugs@FreeBSD.ORG Sun Jan 30 15:00:47 2005 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C457516A4D0 for ; Sun, 30 Jan 2005 15:00:47 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0421443D55 for ; Sun, 30 Jan 2005 15:00:47 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j0UF0hSV083853 for ; Sun, 30 Jan 2005 15:00:43 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j0UF0h1x083832; Sun, 30 Jan 2005 15:00:43 GMT (envelope-from gnats) Resent-Date: Sun, 30 Jan 2005 15:00:43 GMT Resent-Message-Id: <200501301500.j0UF0h1x083832@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Matthew D.Fuller" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32F4716A4CE for ; Sun, 30 Jan 2005 14:55:25 +0000 (GMT) Received: from mortis.over-yonder.net (adsl-222-103-242.jan.bellsouth.net [68.222.103.242]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DC5043D2F for ; Sun, 30 Jan 2005 14:55:24 +0000 (GMT) (envelope-from fullermd@over-yonder.net) Received: by mortis.over-yonder.net (Postfix, from userid 100) id 0FFB4210CD; Sun, 30 Jan 2005 08:55:09 -0600 (CST) Message-Id: <20050130145509.0FFB4210CD@mortis.over-yonder.net> Date: Sun, 30 Jan 2005 08:55:09 -0600 (CST) From: "Matthew D.Fuller" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: bin/76858: [PATCH] Bug in pkg_{install,delete} package name lookup X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Matthew D.Fuller" List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jan 2005 15:00:48 -0000 >Number: 76858 >Category: bin >Synopsis: [PATCH] Bug in pkg_{install,delete} package name lookup >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Jan 30 15:00:42 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Matthew D. Fuller >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD mortis.sighup.org 5.3-STABLE FreeBSD 5.3-STABLE #0: Sat Jan 29 00:29:15 CST 2005 fullermd@mortis:/usr/obj/usr/src/sys/MORTIS i386 >Description: The code in pkg_* that dissects a full path to get a package name out of it doesn't take account of packages that start with numbers, even though it should, and the comment says it does. >How-To-Repeat: (ttyp3):{267}% pkg_info /var/db/pkg/3dc-0.8.1/ pkg_info: can't find package 'pkg' installed or in a file! >Fix: Index: delete/main.c =================================================================== RCS file: /usr/cvs/src/usr.sbin/pkg_install/delete/main.c,v retrieving revision 1.26 diff -u -r1.26 main.c --- delete/main.c 29 Jun 2004 18:54:47 -0000 1.26 +++ delete/main.c 30 Jan 2005 14:48:29 -0000 @@ -121,7 +121,7 @@ * package name. Otherwise we've come across a trailing '/' and * need to continue our quest. */ - if (isalpha(*pkgs_split) || ((MatchType == MATCH_GLOB) && \ + if (isalnum(*pkgs_split) || ((MatchType == MATCH_GLOB) && \ strpbrk(pkgs_split, "*?[]") != NULL)) { *argv = pkgs_split; break; Index: info/main.c =================================================================== RCS file: /usr/cvs/src/usr.sbin/pkg_install/info/main.c,v retrieving revision 1.47 diff -u -r1.47 main.c --- info/main.c 18 Oct 2004 05:34:54 -0000 1.47 +++ info/main.c 30 Jan 2005 14:48:51 -0000 @@ -240,7 +240,7 @@ * we've come across a trailing '/' and need to continue our * quest. */ - if (isalpha(*pkgs_split) || ((MatchType == MATCH_GLOB) && \ + if (isalnum(*pkgs_split) || ((MatchType == MATCH_GLOB) && \ strpbrk(pkgs_split, "*?[]") != NULL)) { *argv = pkgs_split; break; >Release-Note: >Audit-Trail: >Unformatted: