d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bogus suffix stripping to be less naive.

Browse Source 
PR:		3418
Noted by:	pst
This commit is contained in:
jkh 1998-09-08 03:15:41 +00:00
parent 8355921f31
commit a5f5454e47
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.sbin/pkg_install/create/perform.c
View File

@ -1,6 +1,6 @@
#ifndef lint
static const char rcsid[] =
"$Id: perform.c,v 1.41 1998/02/16 17:16:28 jkh Exp $";
"$Id: perform.c,v 1.42 1998/07/28 11:55:39 jkh Exp $";
#endif
/*
@ -45,6 +45,7 @@ pkg_perform(char **pkgs)
FILE *pkg_in, *fp;
Package plist;
char *suffix; /* What we tack on to the end of the finished package */
int len;
/* Preliminary setup */
sanity_check();
@ -62,13 +63,10 @@ pkg_perform(char **pkgs)
}
plist.head = plist.tail = NULL;
/* Break the package name into base and desired suffix (if any) */
if ((cp = rindex(pkg, '.')) != NULL) {
suffix = cp + 1;
*cp = '\0';
}
else
suffix = "tgz";
/* chop suffix off if already specified */
len = strlen(pkg);
if (len > 4 && !strcmp(&pkg[len - 4], ".tgz"))
pkg[len - 4] = '\0';
/* Stick the dependencies, if any, at the top */
if (Pkgdeps) {
@ -174,7 +172,7 @@ pkg_perform(char **pkgs)
cleanup(0), errx(2, "error while closing %s", CONTENTS_FNAME);
/* And stick it into a tar ball */
make_dist(home, pkg, suffix, &plist);
make_dist(home, pkg, "tgz", &plist);
/* Cleanup */
free(Comment);