hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-10 00:13:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set PKG_ADD_BASE hint in a certain case.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1999-05-12 06:11:32 +00:00
parent 722678f1c8
commit 41fe7a1406
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=47041
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
release/sysinstall/package.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * generation being essentially a complete rewrite.
* *
* $Id: package.c,v 1.67 1999/04/27 14:33:29 jkh Exp $ * $Id: package.c,v 1.68 1999/05/07 20:31:36 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -99,7 +99,7 @@ package_exists(char *name)
int int
package_extract(Device *dev, char *name, Boolean depended) package_extract(Device *dev, char *name, Boolean depended)
{ {
char path[511]; char tmp[200], path[511];
int ret, last_msg = 0; int ret, last_msg = 0;
FILE *fp; FILE *fp;
@ -128,13 +128,18 @@ package_extract(Device *dev, char *name, Boolean depended)
if (name[0] == '@') { if (name[0] == '@') {
/* @ at the beginning of the package name means "get latest" */ /* @ at the beginning of the package name means "get latest" */
name++; sprintf(path, "packages/Latest/%s.tgz", ++name);
sprintf(path, "packages/Latest/%s.tgz", name);
} }
else if (!index(name, '/')) else if (!index(name, '/'))
sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz"); sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
else else
sprintf(path, "%s%s", name, strstr(name, ".tgz") ? "" : ".tgz"); sprintf(path, "%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
/* Set hints for pkg_add */
snprintf(tmp, sizeof tmp, "%s/Packages/All/", dev->name);
setenv("PKG_ADD_BASE", tmp, 1);
if (isDebug())
msgDebug("Set PKG_ADD_BASE to %s\n", tmp);
fp = dev->get(dev, path, TRUE); fp = dev->get(dev, path, TRUE);
if (fp) { if (fp) {
int i = 0, tot, pfd[2]; int i = 0, tot, pfd[2];

13
usr.sbin/sysinstall/package.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * generation being essentially a complete rewrite.
* *
* $Id: package.c,v 1.67 1999/04/27 14:33:29 jkh Exp $ * $Id: package.c,v 1.68 1999/05/07 20:31:36 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -99,7 +99,7 @@ package_exists(char *name)
int int
package_extract(Device *dev, char *name, Boolean depended) package_extract(Device *dev, char *name, Boolean depended)
{ {
char path[511]; char tmp[200], path[511];
int ret, last_msg = 0; int ret, last_msg = 0;
FILE *fp; FILE *fp;
@ -128,13 +128,18 @@ package_extract(Device *dev, char *name, Boolean depended)
if (name[0] == '@') { if (name[0] == '@') {
/* @ at the beginning of the package name means "get latest" */ /* @ at the beginning of the package name means "get latest" */
name++; sprintf(path, "packages/Latest/%s.tgz", ++name);
sprintf(path, "packages/Latest/%s.tgz", name);
} }
else if (!index(name, '/')) else if (!index(name, '/'))
sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz"); sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
else else
sprintf(path, "%s%s", name, strstr(name, ".tgz") ? "" : ".tgz"); sprintf(path, "%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
/* Set hints for pkg_add */
snprintf(tmp, sizeof tmp, "%s/Packages/All/", dev->name);
setenv("PKG_ADD_BASE", tmp, 1);
if (isDebug())
msgDebug("Set PKG_ADD_BASE to %s\n", tmp);
fp = dev->get(dev, path, TRUE); fp = dev->get(dev, path, TRUE);
if (fp) { if (fp) {
int i = 0, tot, pfd[2]; int i = 0, tot, pfd[2];