diff options
author | jkh <jkh@FreeBSD.org> | 1997-05-05 08:38:12 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1997-05-05 08:38:12 +0000 |
commit | 83e91844d7a4d68e3743f41187d7a8449db3fd28 (patch) | |
tree | 3857a844317d51e41d9ca4328fa86f8bf99ed1c1 /usr.sbin/sysinstall/index.c | |
parent | 4e2b8410b984881d3f5c42e9a32ec7b5cdaa4820 (diff) | |
download | FreeBSD-src-83e91844d7a4d68e3743f41187d7a8449db3fd28.zip FreeBSD-src-83e91844d7a4d68e3743f41187d7a8449db3fd28.tar.gz |
DOH! Fix package-extractor looping problem by moving some code
to the *proper* part of the loop.
Diffstat (limited to 'usr.sbin/sysinstall/index.c')
-rw-r--r-- | usr.sbin/sysinstall/index.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c index 42dee8c..3d1cb20 100644 --- a/usr.sbin/sysinstall/index.c +++ b/usr.sbin/sysinstall/index.c @@ -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 */ |