Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pass -j to tar to read bzip2 binary pkgs. 

bump PKGTOOLS_VERSION to 20030410.
This commit is contained in:
grant 2003-04-10 05:08:55 +00:00
parent 04a792a536
commit 4253e0d3e1
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.sbin/pkg_install/lib/file.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: file.c,v 1.58 2003/02/02 12:59:54 abs Exp $ */ /* $NetBSD: file.c,v 1.59 2003/04/10 05:08:55 grant Exp $ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp"; static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp";
#else #else
__RCSID("$NetBSD: file.c,v 1.58 2003/02/02 12:59:54 abs Exp $"); __RCSID("$NetBSD: file.c,v 1.59 2003/04/10 05:08:55 grant Exp $");
#endif #endif
#endif #endif
@ -526,19 +526,14 @@ int
unpack(const char *pkg, const char *flist) unpack(const char *pkg, const char *flist)
{ {
char args[10] = "-"; char args[10] = "-";
char *cp; const char *suffix;
/*
* Figure out by a crude heuristic whether this or not this is probably
* compressed.
*/
if (!IS_STDIN(pkg)) { if (!IS_STDIN(pkg)) {
cp = strrchr(pkg, '.'); suffix = suffix_of(pkg);
if (cp) { if (!strcmp(suffix, "tbz"))
cp++; strcat(args, "j");
if (strchr(cp, 'z') || strchr(cp, 'Z')) else if (!strcmp(suffix, "tgz"))
strcat(args, "z"); strcat(args, "z");
}
} else } else
strcat(args, "z"); strcat(args, "z");
strcat(args, "xpf"); strcat(args, "xpf");

4
usr.sbin/pkg_install/lib/version.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: version.h,v 1.23 2003/03/24 23:33:44 hubertf Exp $ */ /* $NetBSD: version.h,v 1.24 2003/04/10 05:08:55 grant Exp $ */
/* /*
* Copyright (c) 2001 Thomas Klausner. All rights reserved. * Copyright (c) 2001 Thomas Klausner. All rights reserved.
@ -33,6 +33,6 @@
#ifndef _INST_LIB_VERSION_H_ #ifndef _INST_LIB_VERSION_H_
#define _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_
#define PKGTOOLS_VERSION "20030325" #define PKGTOOLS_VERSION "20030410"
#endif /* _INST_LIB_VERSION_H_ */ #endif /* _INST_LIB_VERSION_H_ */