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

avoid "... dutch" being interpreted as a pascal continuation message, and

Browse Source 
core-dumping.
This commit is contained in:
christos 2011-08-17 13:11:22 +00:00
parent 77984ce781
commit ea9a6fbf23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/error/error.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: error.h,v 1.17 2011/05/21 00:43:31 christos Exp $ */
/* $NetBSD: error.h,v 1.18 2011/08/17 13:11:22 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@ -203,6 +203,7 @@ extern boolean *touchedfiles; /* which files we touched */
*/
extern int language;
extern char *currentfilename;
extern char default_currentfilename[];
/*
* Macros for initializing arrays of string constants.

6
usr.bin/error/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.20 2011/05/21 00:43:42 christos Exp $ */
/* $NetBSD: main.c,v 1.21 2011/08/17 13:11:22 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
__RCSID("$NetBSD: main.c,v 1.20 2011/05/21 00:43:42 christos Exp $");
__RCSID("$NetBSD: main.c,v 1.21 2011/08/17 13:11:22 christos Exp $");
#endif /* not lint */
#include <signal.h>
@ -68,7 +68,7 @@ Eptr **files; /* array of pointers into errors*/
boolean *touchedfiles; /* which files we touched */
int language = INCC;
static char default_currentfilename[] = "????";
char default_currentfilename[] = "????";
char *currentfilename = default_currentfilename;
boolean query = false; /* query the operator if touch files */

7
usr.bin/error/pi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pi.c,v 1.17 2009/08/13 06:59:37 dholland Exp $ */
/* $NetBSD: pi.c,v 1.18 2011/08/17 13:11:22 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pi.c 8.1 (Berkeley) 6/6/93";
#endif
__RCSID("$NetBSD: pi.c,v 1.17 2009/08/13 06:59:37 dholland Exp $");
__RCSID("$NetBSD: pi.c,v 1.18 2011/08/17 13:11:22 christos Exp $");
#endif /* not lint */
#include <stdio.h>
@ -364,7 +364,8 @@ pi(void)
cur_wordc += 1 + 3;
return (C_THISFILE);
}
if (strcmp(cur_wordv[1], "...") == 0) {
if (strcmp(cur_wordv[1], "...") == 0 && c_linenumber &&
currentfilename != default_currentfilename) {
/*
* have a continuation error message
* of the form: ... message