From 8378bbaded49129e6c8a3d76527e3fdce7d5752a Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Sat, 29 Mar 1997 06:44:57 +0000 Subject: [PATCH] Catch this puppy up to RELENG_2_2 --- release/sysinstall/index.c | 8 +++++--- usr.sbin/sysinstall/index.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c index e385407e47b..5e426fbabac 100644 --- a/release/sysinstall/index.c +++ b/release/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.46 1997/03/25 03:07:33 jkh Exp $ + * $Id: index.c,v 1.38.2.7 1997/03/27 00:41:00 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -216,9 +216,10 @@ readline(FILE *fp, char *buf, int max) } int -index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, char *descr, char *maint, char *cats, char *deps) +index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, char *descr, char *maint, char *cats, char *rdeps) { char line[1024]; + char junk[256]; char *cp; int i; @@ -233,7 +234,8 @@ index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, cha cp += copy_to_sep(descr, cp, '|'); cp += copy_to_sep(maint, cp, '|'); cp += copy_to_sep(cats, cp, '|'); - (void)copy_to_sep(deps, cp, '|'); + cp += copy_to_sep(junk, cp, '|'); /* build deps - not used */ + (void)copy_to_sep(rdeps, cp, '|'); /* We're not actually interested in any of the other fields */ return 0; } diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c index e385407e47b..5e426fbabac 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.46 1997/03/25 03:07:33 jkh Exp $ + * $Id: index.c,v 1.38.2.7 1997/03/27 00:41:00 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -216,9 +216,10 @@ readline(FILE *fp, char *buf, int max) } int -index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, char *descr, char *maint, char *cats, char *deps) +index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, char *descr, char *maint, char *cats, char *rdeps) { char line[1024]; + char junk[256]; char *cp; int i; @@ -233,7 +234,8 @@ index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, cha cp += copy_to_sep(descr, cp, '|'); cp += copy_to_sep(maint, cp, '|'); cp += copy_to_sep(cats, cp, '|'); - (void)copy_to_sep(deps, cp, '|'); + cp += copy_to_sep(junk, cp, '|'); /* build deps - not used */ + (void)copy_to_sep(rdeps, cp, '|'); /* We're not actually interested in any of the other fields */ return 0; }