Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle long lines without core-dumping.

This commit is contained in:
christos 1995-09-10 15:55:13 +00:00
parent c08d930690
commit 49a4e14351
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.bin/error/input.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: input.c,v 1.3 1995/09/02 06:15:32 jtc Exp $ */
/* $NetBSD: input.c,v 1.4 1995/09/10 15:55:13 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 6/6/93";
#endif
static char rcsid[] = "$NetBSD: input.c,v 1.3 1995/09/02 06:15:32 jtc Exp $";
static char rcsid[] = "$NetBSD: input.c,v 1.4 1995/09/10 15:55:13 christos Exp $";
#endif /* not lint */
#include <stdio.h>
@ -70,19 +70,23 @@ Errorclass mod2();
* Eat all of the lines in the input file, attempting to categorize
* them by their various flavors
*/
static char inbuffer[BUFSIZ];
eaterrors(r_errorc, r_errorv)
int *r_errorc;
Eptr **r_errorv;
{
extern boolean piflag;
Errorclass errorclass = C_SYNC;
char *line;
char *inbuffer;
size_t inbuflen;
for (;;){
if (fgets(inbuffer, BUFSIZ, errorfile) == NULL)
if ((inbuffer = fgetln(errorfile, &inbuflen)) == NULL)
break;
wordvbuild(inbuffer, &wordc, &wordv);
line = Calloc(inbuflen + 1, sizeof(char));
memcpy(line, inbuffer, inbuflen);
line[inbuflen] = '\0';
wordvbuild(line, &wordc, &wordv);
/*
* for convience, convert wordv to be 1 based, instead
* of 0 based.

10
usr.bin/error/subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr.c,v 1.3 1995/09/02 06:15:49 jtc Exp $ */
/* $NetBSD: subr.c,v 1.4 1995/09/10 15:55:15 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 6/6/93";
#endif
static char rcsid[] = "$NetBSD: subr.c,v 1.3 1995/09/02 06:15:49 jtc Exp $";
static char rcsid[] = "$NetBSD: subr.c,v 1.4 1995/09/10 15:55:15 christos Exp $";
#endif /* not lint */
#include <stdio.h>
@ -333,13 +333,11 @@ wordvbuild(string, r_wordc, r_wordv)
char ***r_wordv;
{
reg char *cp;
char *saltedbuffer;
char **wordv;
int wordcount;
int wordindex;
saltedbuffer = strsave(string);
for (wordcount = 0, cp = saltedbuffer; *cp; wordcount++){
for (wordcount = 0, cp = string; *cp; wordcount++){
while (*cp && isspace(*cp))
cp++;
if (*cp == 0)
@ -348,7 +346,7 @@ wordvbuild(string, r_wordc, r_wordv)
cp++;
}
wordv = (char **)Calloc(wordcount + 1, sizeof (char *));
for (cp=saltedbuffer,wordindex=0; wordcount; wordindex++,--wordcount){
for (cp=string,wordindex=0; wordcount; wordindex++,--wordcount){
while (*cp && isspace(*cp))
cp++;
if (*cp == 0)