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

You can run pkg_info everywhere expect /var/db/pkg directory :-)

Browse Source 
Running there you got any kind of strange errors from tar caused
by treating directories as tar files!
Fix it by adding new isfile(name) (check for reg. files) to simple fexists(name) calls.
This commit is contained in:
ache 1995-07-30 01:44:45 +00:00
parent 187d46fc1a
commit 2360072913
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/pkg_install/info/perform.c
View File

@ -1,5 +1,5 @@
#ifndef lint
static const char *rcsid = "$Id: perform.c,v 1.15 1995/05/10 23:00:06 jkh Exp $";
static const char *rcsid = "$Id: perform.c,v 1.16 1995/05/30 03:49:59 rgrimes Exp $";
#endif
/*
@ -91,7 +91,7 @@ pkg_do(char *pkg)
isTMP = TRUE;
}
}
else if (fexists(pkg)) {
else if (fexists(pkg) && isfile(pkg)) {
int len;
if (*pkg != '/') {

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

@ -1,5 +1,5 @@
#ifndef lint
static const char *rcsid = "$Id: file.c,v 1.10 1995/05/30 03:50:05 rgrimes Exp $";
static const char *rcsid = "$Id: file.c,v 1.11 1995/06/24 10:12:59 asami Exp $";
#endif
/*
@ -71,6 +71,15 @@ isemptydir(char *fname)
return FALSE;
}
Boolean
isfile(char *fname)
{
struct stat sb;
if (stat(fname, &sb) != FAIL && S_ISREG(sb.st_mode))
return TRUE;
return FALSE;
}
/* Check to see if file is a file and is empty. If nonexistent or not
a file, say "it's empty", otherwise return TRUE if zero sized. */
Boolean
@ -256,7 +265,7 @@ fileFindByPath(char *fname)
static char tmp[FILENAME_MAX];
char *cp;
if (fexists(fname)) {
if (fexists(fname) && isfile(fname)) {
strcpy(tmp, fname);
return tmp;
}
@ -265,7 +274,7 @@ fileFindByPath(char *fname)
char *cp2 = strsep(&cp, ":");
snprintf(tmp, FILENAME_MAX, "%s/%s.tgz", cp2 ? cp2 : cp, fname);
if (fexists(tmp))
if (fexists(tmp) && isfile(fname))
return tmp;
}
return NULL;

3
usr.sbin/pkg_install/lib/lib.h
View File

@ -1,4 +1,4 @@
/* $Id: lib.h,v 1.15 1995/04/22 13:58:43 jkh Exp $ */
/* $Id: lib.h,v 1.16 1995/04/26 15:08:22 jkh Exp $ */
/*
* FreeBSD install - a package for the installation and maintainance
@ -122,6 +122,7 @@ char *basename_of(char *);
/* File */
Boolean fexists(char *);
Boolean isdir(char *);
Boolean isfile(char *);
Boolean isempty(char *);
Boolean isURL(char *);
char *fileGetURL(char *);