hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-16 15:44:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

DOH! Fix package-extractor looping problem by moving some code

Browse Source 
to the *proper* part of the loop.
This commit is contained in:
Jordan K. Hubbard 1997-05-05 08:38:12 +00:00
parent 86696f47ac
commit 6ca2689df0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=25481
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
release/sysinstall/index.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: index.c,v 1.48 1997/03/29 06:44:46 jkh Exp $
* $Id: index.c,v 1.49 1997/04/05 07:08:14 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -74,6 +74,7 @@ static char *descrs[] = {
"cad", "Computer Aided Design utilities.",
"chinese", "Ported software for the Chinese market.",
"comms", "Communications utilities.",
"converters", "Format conversion utilities..",
"databases", "Database software.",
"devel", "Software development utilities and libraries.",
"development", "Software development utilities and libraries.",
@ -97,6 +98,7 @@ static char *descrs[] = {
"news", "USENET News support software.",
"numeric", "Mathematical computation software.",
"orphans", "Packages without a home elsewhere.",
"perl5", "Utilities/modules for the PERL5 language..",
"plan9", "Software from the plan9 Operating System.",
"print", "Utilities for dealing with printing.",
"printing", "Utilities for dealing with printing.",
@ -105,11 +107,13 @@ static char *descrs[] = {
"security", "System security software.",
"shells", "Various shells (tcsh, bash, etc).",
"sysutils", "Various system utilities.",
"www", "WEB utilities (browers, HTTP servers, etc).",
"textproc", "Text processing/search utilities.",
"tk41", "Utilities & packages for the TK 4.1 toolkit.",
"troff", "TROFF Text formatting utilities.",
"utils", "Various user utilities.",
"utilities", "Various user utilities.",
"vietnamese", "Ported software for the Vietnamese market.",
"www", "WEB utilities (browers, HTTP servers, etc).",
"x11", "X Window System based utilities.",
NULL, NULL,
};
@ -577,11 +581,11 @@ index_extract_one(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended)
else
msgConfirm("Loading of dependant package %s failed", cp);
}
if (cp2)
cp = cp2 + 1;
else
cp = NULL;
}
if (cp2)
cp = cp2 + 1;
else
cp = NULL;
}
}
/* Done with the deps? Load the real m'coy */

16
usr.sbin/sysinstall/index.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: index.c,v 1.48 1997/03/29 06:44:46 jkh Exp $
* $Id: index.c,v 1.49 1997/04/05 07:08:14 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -74,6 +74,7 @@ static char *descrs[] = {
"cad", "Computer Aided Design utilities.",
"chinese", "Ported software for the Chinese market.",
"comms", "Communications utilities.",
"converters", "Format conversion utilities..",
"databases", "Database software.",
"devel", "Software development utilities and libraries.",
"development", "Software development utilities and libraries.",
@ -97,6 +98,7 @@ static char *descrs[] = {
"news", "USENET News support software.",
"numeric", "Mathematical computation software.",
"orphans", "Packages without a home elsewhere.",
"perl5", "Utilities/modules for the PERL5 language..",
"plan9", "Software from the plan9 Operating System.",
"print", "Utilities for dealing with printing.",
"printing", "Utilities for dealing with printing.",
@ -105,11 +107,13 @@ static char *descrs[] = {
"security", "System security software.",
"shells", "Various shells (tcsh, bash, etc).",
"sysutils", "Various system utilities.",
"www", "WEB utilities (browers, HTTP servers, etc).",
"textproc", "Text processing/search utilities.",
"tk41", "Utilities & packages for the TK 4.1 toolkit.",
"troff", "TROFF Text formatting utilities.",
"utils", "Various user utilities.",
"utilities", "Various user utilities.",
"vietnamese", "Ported software for the Vietnamese market.",
"www", "WEB utilities (browers, HTTP servers, etc).",
"x11", "X Window System based utilities.",
NULL, NULL,
};
@ -577,11 +581,11 @@ index_extract_one(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended)
else
msgConfirm("Loading of dependant package %s failed", cp);
}
if (cp2)
cp = cp2 + 1;
else
cp = NULL;
}
if (cp2)
cp = cp2 + 1;
else
cp = NULL;
}
}
/* Done with the deps? Load the real m'coy */