summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_install/add/perform.c
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2000-04-28 22:13:56 +0000
committerMarc Espie <espie@cvs.openbsd.org>2000-04-28 22:13:56 +0000
commit68c26c6b9c977f94fc4a9993226a2932a952ced2 (patch)
tree36791df2738d78acdce9f60c70c87f676aad7983 /usr.sbin/pkg_install/add/perform.c
parent685cf0990434145d169b8ad117bfa8e88f252834 (diff)
Remove last remnants of @option preserve and @option extract-in-place
We don't use these, and they are a bad idea anyway.
Diffstat (limited to 'usr.sbin/pkg_install/add/perform.c')
-rw-r--r--usr.sbin/pkg_install/add/perform.c30
1 files changed, 2 insertions, 28 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
index 4937a676afb..2c2b0c7d5ae 100644
--- a/usr.sbin/pkg_install/add/perform.c
+++ b/usr.sbin/pkg_install/add/perform.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: perform.c,v 1.13 2000/04/16 22:02:26 espie Exp $ */
+/* $OpenBSD: perform.c,v 1.14 2000/04/28 22:13:54 espie Exp $ */
#ifndef lint
-static const char *rcsid = "$OpenBSD: perform.c,v 1.13 2000/04/16 22:02:26 espie Exp $";
+static const char *rcsid = "$OpenBSD: perform.c,v 1.14 2000/04/28 22:13:54 espie Exp $";
#endif
/*
@@ -167,32 +167,6 @@ pkg_do(char *pkg)
read_plist(&Plist, cfile);
fclose(cfile);
- /* Extract directly rather than moving? Oh goodie! */
- if (find_plist_option(&Plist, "extract-in-place")) {
- if (Verbose)
- printf("Doing in-place extraction for `%s'\n", pkg_fullname);
- p = find_plist(&Plist, PLIST_CWD);
- if (p) {
- if (!(isdir(p->name) || islinktodir(p->name)) && !Fake) {
- if (Verbose)
- printf("Desired prefix of `%s' does not exist, creating\n", p->name);
- vsystem("mkdir -p %s", p->name);
- }
- if (chdir(p->name) == -1) {
- warn("unable to change directory to `%s'", p->name);
- goto bomb;
- }
- where_to = p->name;
- inPlace = 1;
- }
- else {
- warnx(
- "no prefix specified in `%s' - this is a bad package!",
- pkg_fullname);
- goto bomb;
- }
- }
-
/*
* Apply a crude heuristic to see how much space the package will
* take up once it's unpacked. I've noticed that most packages