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

o Remove all of the objformat logic, it's never coming back.

Browse Source 
o Simplify getpackagesite(), it comes back in full glory when we branch
again. It's still needed however to get the i386 or alpha directory.
This commit is contained in:
Bill Fumerola 1999-09-25 03:02:08 +00:00
parent daf41e696a
commit db86a11e69
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.sbin/pkg_install/add/main.c
View File

@ -27,7 +27,6 @@ static const char rcsid[] =
#include <err.h>
#include <sys/param.h>
#include <sys/utsname.h>
#include <objformat.h>
#include "lib.h"
#include "add.h"
@ -50,7 +49,7 @@ add_mode_t AddMode = NORMAL;
char pkgnames[MAX_PKGS][MAXPATHLEN];
char *pkgs[MAX_PKGS];
static char *getpackagesite(char *);
static char *getpackagesite(void);
int getosreldate(void);
static void usage __P((void));
@ -63,7 +62,6 @@ main(int argc, char **argv)
char *cp;
char *remotepkg = NULL, *ptr;
static char binformat[1024];
static char packageroot[MAXPATHLEN] = "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/";
start = argv;
@ -131,10 +129,8 @@ main(int argc, char **argv)
/* Get all the remaining package names, if any */
for (ch = 0; *argv; ch++, argv++) {
if (Remote) {
if (getenv("PACKAGESITE") == NULL) {
getobjformat(binformat, sizeof(binformat), &argc, argv);
strcat(packageroot, getpackagesite(binformat));
}
if (getenv("PACKAGESITE") == NULL)
strcat(packageroot, getpackagesite());
else
strcpy(packageroot, (getenv("PACKAGESITE")));
remotepkg = strcat(packageroot, *argv);
@ -185,7 +181,7 @@ main(int argc, char **argv)
}
static char *
getpackagesite(char binform[1024])
getpackagesite(void)
{
int reldate;
static char sitepath[MAXPATHLEN];
@ -196,14 +192,7 @@ getpackagesite(char binform[1024])
uname(&u);
strcpy(sitepath, u.machine);
if (reldate == 300005)
strcat(sitepath, "/packages-3.0/");
else if (300000 < reldate && reldate <= 300004)
strcat(sitepath, "/packages-3.0-aout/Latest/");
else if (300004 < reldate && reldate < 400000)
strcat(sitepath, !strcmp(binform, "elf") ? "/packages-3-stable/Latest/" :
"/packages-3.0-aout/Latest/");
else
if (reldate >= 400000)
strcat(sitepath, "/packages-current/Latest/");
return sitepath;