summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg_install/delete
diff options
context:
space:
mode:
authordan <dan@FreeBSD.org>2000-01-18 01:45:54 +0000
committerdan <dan@FreeBSD.org>2000-01-18 01:45:54 +0000
commit19a5ef96d9461944ad98ddab0e242cc4f3974211 (patch)
treeaf3056790b378e9db654057eb72d60f0db88336e /usr.sbin/pkg_install/delete
parent7d5f58b26b1bafd25e34a60d7abcf048ba915e72 (diff)
downloadFreeBSD-src-19a5ef96d9461944ad98ddab0e242cc4f3974211.zip
FreeBSD-src-19a5ef96d9461944ad98ddab0e242cc4f3974211.tar.gz
Fix a bug in previous commit where pkg_{delete,info} foo-1.0/ would segfault.
Noticed first by: kris
Diffstat (limited to 'usr.sbin/pkg_install/delete')
-rw-r--r--usr.sbin/pkg_install/delete/main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index 7567286..5b2341e 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -89,11 +89,13 @@ main(int argc, char **argv)
while( !isalpha(*(pkgs_split+1)) )
{
*pkgs_split = '\0';
- pkgs_split = rindex(*argv, (int) '/');
+ if ( (pkgs_split = rindex(*argv, (int) '/')) == NULL )
+ pkgs_split = *argv;
}
if(pkgs_split != NULL)
{
- pkgs_split++;
+ if (*pkgs_split == '/')
+ pkgs_split++;
*pkgs = pkgs_split;
pkgs++;
}
OpenPOWER on IntegriCloud