diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1995-10-25 15:38:37 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1995-10-25 15:38:37 +0000 |
| commit | 36b7319742ddd913fef91b3fd8b52ed3db79baed (patch) | |
| tree | 38f96dd54eeecc8a263b88c6c73dd075dcbadb38 /usr.sbin/pkg_install/create | |
| parent | 59f0c0d522401b5af351f214e49cd7a2f309a832 (diff) | |
Notes
Diffstat (limited to 'usr.sbin/pkg_install/create')
| -rw-r--r-- | usr.sbin/pkg_install/create/create.h | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/create/main.c | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/create/perform.c | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/usr.sbin/pkg_install/create/create.h b/usr.sbin/pkg_install/create/create.h index 8f4db25b06fe..60dd490b3835 100644 --- a/usr.sbin/pkg_install/create/create.h +++ b/usr.sbin/pkg_install/create/create.h @@ -1,4 +1,4 @@ -/* $Id: create.h,v 1.7 1995/04/09 15:04:57 jkh Exp $ */ +/* $Id: create.h,v 1.8.4.1 1995/10/09 11:16:23 jkh Exp $ */ /* * FreeBSD install - a package for the installation and maintainance @@ -31,7 +31,7 @@ extern char *Install; extern char *DeInstall; extern char *Contents; extern char *Require; -extern char *PlayPen; +extern char PlayPen[]; extern char *ExcludeFrom; extern char *Mtree; extern char *Pkgdeps; diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c index f2531b32a40e..757a0e23acd1 100644 --- a/usr.sbin/pkg_install/create/main.c +++ b/usr.sbin/pkg_install/create/main.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: main.c,v 1.10 1995/04/22 00:03:07 jkh Exp $"; +static const char *rcsid = "$Id: main.c,v 1.11.4.1 1995/10/09 11:16:24 jkh Exp $"; #endif /* @@ -26,7 +26,7 @@ char *Install = NULL; char *DeInstall = NULL; char *Contents = NULL; char *Require = NULL; -char *PlayPen = NULL; +char PlayPen[FILENAME_MAX]; char *ExcludeFrom = NULL; char *Mtree = NULL; char *Pkgdeps = NULL; @@ -88,7 +88,7 @@ main(int argc, char **argv) break; case 't': - PlayPen = optarg; + strcpy(PlayPen, optarg); break; case 'X': diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c index 0c773e9c5bd7..b1a67ec82162 100644 --- a/usr.sbin/pkg_install/create/perform.c +++ b/usr.sbin/pkg_install/create/perform.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: perform.c,v 1.26 1995/05/10 20:46:06 jkh Exp $"; +static const char *rcsid = "$Id: perform.c,v 1.27.4.1 1995/10/14 19:11:22 jkh Exp $"; #endif /* @@ -31,11 +31,13 @@ static const char *rcsid = "$Id: perform.c,v 1.26 1995/05/10 20:46:06 jkh Exp $" static void sanity_check(void); static void make_dist(char *, char *, char *, Package *); +static char *home; + int pkg_perform(char **pkgs) { char *pkg = *pkgs; /* Only one arg to create */ - char *home, *cp; + char *cp; FILE *pkg_in, *fp; Package plist; char *suffix; /* What we tack on to the end of the finished package */ @@ -268,5 +270,5 @@ sanity_check() void cleanup(int sig) { - leave_playpen(); + leave_playpen(home); } |