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

fix nested externs

Browse Source 
rename raise to upcase to avoid clash with raise(3)
This commit is contained in:
christos 2001-02-05 02:07:52 +00:00
parent e5785ba616
commit 85ef06032c
13 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/mail/aux.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aux.c,v 1.10 1998/12/19 16:30:52 christos Exp $ */ /* $NetBSD: aux.c,v 1.11 2001/02/05 02:07:52 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93";
#else #else
__RCSID("$NetBSD: aux.c,v 1.10 1998/12/19 16:30:52 christos Exp $"); __RCSID("$NetBSD: aux.c,v 1.11 2001/02/05 02:07:52 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -628,7 +628,7 @@ anyof(s1, s2)
* Convert c to upper case * Convert c to upper case
*/ */
int int
raise(c) upcase(c)
int c; int c;
{ {

6
usr.bin/mail/cmd1.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cmd1.c,v 1.13 2000/02/10 12:34:42 tron Exp $ */ /* $NetBSD: cmd1.c,v 1.14 2001/02/05 02:07:52 christos Exp $ */
/*- /*-
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)cmd1.c 8.2 (Berkeley) 4/20/95"; static char sccsid[] = "@(#)cmd1.c 8.2 (Berkeley) 4/20/95";
#else #else
__RCSID("$NetBSD: cmd1.c,v 1.13 2000/02/10 12:34:42 tron Exp $"); __RCSID("$NetBSD: cmd1.c,v 1.14 2001/02/05 02:07:52 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -50,6 +50,7 @@ __RCSID("$NetBSD: cmd1.c,v 1.13 2000/02/10 12:34:42 tron Exp $");
* *
* User commands. * User commands.
*/ */
extern const struct cmd cmdtab[];
/* /*
* Print the current active headings. * Print the current active headings.
@ -235,7 +236,6 @@ int
pcmdlist(v) pcmdlist(v)
void *v; void *v;
{ {
extern const struct cmd cmdtab[];
const struct cmd *cp; const struct cmd *cp;
int cc; int cc;

6
usr.bin/mail/cmd2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cmd2.c,v 1.10 2000/02/10 12:34:43 tron Exp $ */ /* $NetBSD: cmd2.c,v 1.11 2001/02/05 02:07:52 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93";
#else #else
__RCSID("$NetBSD: cmd2.c,v 1.10 2000/02/10 12:34:43 tron Exp $"); __RCSID("$NetBSD: cmd2.c,v 1.11 2001/02/05 02:07:52 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -50,6 +50,7 @@ __RCSID("$NetBSD: cmd2.c,v 1.10 2000/02/10 12:34:43 tron Exp $");
* *
* More user commands. * More user commands.
*/ */
extern int wait_status;
static int igcomp __P((const void *, const void *)); static int igcomp __P((const void *, const void *));
/* /*
@ -382,7 +383,6 @@ core(v)
void *v; void *v;
{ {
int pid; int pid;
extern int wait_status;
switch (pid = vfork()) { switch (pid = vfork()) {
case -1: case -1:

11
usr.bin/mail/collect.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: collect.c,v 1.20 2000/02/10 12:34:43 tron Exp $ */ /* $NetBSD: collect.c,v 1.21 2001/02/05 02:07:53 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94"; static char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94";
#else #else
__RCSID("$NetBSD: collect.c,v 1.20 2000/02/10 12:34:43 tron Exp $"); __RCSID("$NetBSD: collect.c,v 1.21 2001/02/05 02:07:53 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -52,6 +52,9 @@ __RCSID("$NetBSD: collect.c,v 1.20 2000/02/10 12:34:43 tron Exp $");
#include "rcv.h" #include "rcv.h"
#include "extern.h" #include "extern.h"
extern char *tempMail;
extern char *tempEdit;
/* /*
* Read a message from standard output and return a read file to it * Read a message from standard output and return a read file to it
* or NULL on error. * or NULL on error.
@ -84,7 +87,6 @@ collect(hp, printheaders)
int lc, cc, escape, eofcount; int lc, cc, escape, eofcount;
int c, t; int c, t;
char linebuf[LINESIZE], *cp; char linebuf[LINESIZE], *cp;
extern char *tempMail;
char getsub; char getsub;
sigset_t nset; sigset_t nset;
int longline, lastlong, rc; /* So we don't make 2 or more lines int longline, lastlong, rc; /* So we don't make 2 or more lines
@ -334,7 +336,6 @@ cont:
break; break;
if (*cp == '!') { /* insert stdout of command */ if (*cp == '!') { /* insert stdout of command */
extern char *tempEdit;
char *shell; char *shell;
int nullfd; int nullfd;
int rc; int rc;
@ -564,7 +565,6 @@ mespipe(fp, cmd)
{ {
FILE *nf; FILE *nf;
sig_t sigint = signal(SIGINT, SIG_IGN); sig_t sigint = signal(SIGINT, SIG_IGN);
extern char *tempEdit;
char *shell; char *shell;
if ((nf = Fopen(tempEdit, "w+")) == NULL) { if ((nf = Fopen(tempEdit, "w+")) == NULL) {
@ -613,7 +613,6 @@ forward(ms, fp, f)
int f; int f;
{ {
int *msgvec; int *msgvec;
extern char *tempMail;
struct ignoretab *ig; struct ignoretab *ig;
char *tabst; char *tabst;

6
usr.bin/mail/edit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: edit.c,v 1.7 1997/11/25 17:58:17 bad Exp $ */ /* $NetBSD: edit.c,v 1.8 2001/02/05 02:07:53 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)edit.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)edit.c 8.1 (Berkeley) 6/6/93";
#else #else
__RCSID("$NetBSD: edit.c,v 1.7 1997/11/25 17:58:17 bad Exp $"); __RCSID("$NetBSD: edit.c,v 1.8 2001/02/05 02:07:53 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -50,6 +50,7 @@ __RCSID("$NetBSD: edit.c,v 1.7 1997/11/25 17:58:17 bad Exp $");
* *
* Perform message editing functions. * Perform message editing functions.
*/ */
extern char *tempEdit;
/* /*
* Edit a message list. * Edit a message list.
@ -156,7 +157,6 @@ run_editor(fp, size, type, readonly)
time_t modtime; time_t modtime;
char *edit; char *edit;
struct stat statb; struct stat statb;
extern char *tempEdit;
if ((t = creat(tempEdit, readonly ? 0400 : 0600)) < 0) { if ((t = creat(tempEdit, readonly ? 0400 : 0600)) < 0) {
perror(tempEdit); perror(tempEdit);

6
usr.bin/mail/extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.11 2000/02/10 12:34:43 tron Exp $ */ /* $NetBSD: extern.h,v 1.12 2001/02/05 02:07:53 christos Exp $ */
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -33,7 +33,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)extern.h 8.2 (Berkeley) 4/20/95 * @(#)extern.h 8.2 (Berkeley) 4/20/95
* $NetBSD: extern.h,v 1.11 2000/02/10 12:34:43 tron Exp $ * $NetBSD: extern.h,v 1.12 2001/02/05 02:07:53 christos Exp $
*/ */
struct name; struct name;
@ -203,7 +203,7 @@ int putline __P((FILE *, char *, int));
int pversion __P((void *)); int pversion __P((void *));
void quit __P((void)); void quit __P((void));
int quitcmd __P((void *)); int quitcmd __P((void *));
int raise __P((int)); int upcase __P((int));
int readline __P((FILE *, char *, int)); int readline __P((FILE *, char *, int));
void register_file __P((FILE *, int, int)); void register_file __P((FILE *, int, int));
void regret __P((int)); void regret __P((int));

8
usr.bin/mail/fio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fio.c,v 1.12 1998/12/19 16:32:34 christos Exp $ */ /* $NetBSD: fio.c,v 1.13 2001/02/05 02:07:53 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95"; static char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95";
#else #else
__RCSID("$NetBSD: fio.c,v 1.12 1998/12/19 16:32:34 christos Exp $"); __RCSID("$NetBSD: fio.c,v 1.13 2001/02/05 02:07:53 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -50,6 +50,8 @@ __RCSID("$NetBSD: fio.c,v 1.12 1998/12/19 16:32:34 christos Exp $");
* *
* File I/O. * File I/O.
*/ */
extern int wait_status;
extern char *tmpdir;
/* /*
* Set up the input pointers while copying the mail file into /tmp. * Set up the input pointers while copying the mail file into /tmp.
@ -59,7 +61,6 @@ setptr(ibuf, offset)
FILE *ibuf; FILE *ibuf;
off_t offset; off_t offset;
{ {
extern char *tmpdir;
int c, count; int c, count;
char *cp, *cp2; char *cp, *cp2;
struct message this; struct message this;
@ -355,7 +356,6 @@ expand(name)
char *cp, *shell; char *cp, *shell;
int pivec[2]; int pivec[2];
struct stat sbuf; struct stat sbuf;
extern int wait_status;
/* /*
* The order of evaluation is "%" and "#" expand into constants. * The order of evaluation is "%" and "#" expand into constants.

12
usr.bin/mail/lex.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lex.c,v 1.15 2000/07/06 14:12:31 ad Exp $ */ /* $NetBSD: lex.c,v 1.16 2001/02/05 02:07:53 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95"; static char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95";
#else #else
__RCSID("$NetBSD: lex.c,v 1.15 2000/07/06 14:12:31 ad Exp $"); __RCSID("$NetBSD: lex.c,v 1.16 2001/02/05 02:07:53 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -51,6 +51,10 @@ __RCSID("$NetBSD: lex.c,v 1.15 2000/07/06 14:12:31 ad Exp $");
* Lexical processing of commands. * Lexical processing of commands.
*/ */
extern char *version;
extern const struct cmd cmdtab[];
extern char *tempMesg;
char *prompt = "& "; char *prompt = "& ";
/* /*
@ -69,7 +73,6 @@ setfile(name)
char isedit = *name != '%' || getuserid(myname) != getuid(); char isedit = *name != '%' || getuserid(myname) != getuid();
char *who = name[1] ? name + 1 : myname; char *who = name[1] ? name + 1 : myname;
static int shudclob; static int shudclob;
extern char *tempMesg;
if ((name = expand(name)) == NOSTR) if ((name = expand(name)) == NOSTR)
return -1; return -1;
@ -502,7 +505,6 @@ const struct cmd *
lex(word) lex(word)
char word[]; char word[];
{ {
extern const struct cmd cmdtab[];
const struct cmd *cp; const struct cmd *cp;
for (cp = &cmdtab[0]; cp->c_name != NOSTR; cp++) for (cp = &cmdtab[0]; cp->c_name != NOSTR; cp++)
@ -690,8 +692,6 @@ int
pversion(v) pversion(v)
void *v; void *v;
{ {
extern char *version;
printf("Version %s\n", version); printf("Version %s\n", version);
return(0); return(0);
} }

12
usr.bin/mail/list.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: list.c,v 1.9 1998/12/19 16:33:24 christos Exp $ */ /* $NetBSD: list.c,v 1.10 2001/02/05 02:07:53 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)list.c 8.4 (Berkeley) 5/1/95"; static char sccsid[] = "@(#)list.c 8.4 (Berkeley) 5/1/95";
#else #else
__RCSID("$NetBSD: list.c,v 1.9 1998/12/19 16:33:24 christos Exp $"); __RCSID("$NetBSD: list.c,v 1.10 2001/02/05 02:07:53 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -670,7 +670,7 @@ matchsender(str, mesg)
while (*cp2) { while (*cp2) {
if (*cp == 0) if (*cp == 0)
return(1); return(1);
if (raise(*cp++) != raise(*cp2++)) { if (upcase(*cp++) != upcase(*cp2++)) {
cp2 = ++backup; cp2 = ++backup;
cp = str; cp = str;
} }
@ -708,7 +708,7 @@ matchto(str, mesg)
while (*cp2) { while (*cp2) {
if (*cp == 0) if (*cp == 0)
return(1); return(1);
if (raise(*cp++) != raise(*cp2++)) { if (upcase(*cp++) != upcase(*cp2++)) {
cp2 = ++backup; cp2 = ++backup;
cp = str; cp = str;
} }
@ -752,7 +752,7 @@ matchsubj(str, mesg)
if (value("searchheaders") && (cp = strchr(str, ':'))) { if (value("searchheaders") && (cp = strchr(str, ':'))) {
/* Check for special case "/To:" */ /* Check for special case "/To:" */
if (raise(str[0]) == 'T' && raise(str[1]) == 'O' && if (upcase(str[0]) == 'T' && upcase(str[1]) == 'O' &&
str[2] == ':') str[2] == ':')
return(matchto(cp, mesg)); return(matchto(cp, mesg));
*cp++ = '\0'; *cp++ = '\0';
@ -769,7 +769,7 @@ matchsubj(str, mesg)
while (*cp2) { while (*cp2) {
if (*cp == 0) if (*cp == 0)
return(1); return(1);
if (raise(*cp++) != raise(*cp2++)) { if (upcase(*cp++) != upcase(*cp2++)) {
cp2 = ++backup; cp2 = ++backup;
cp = str; cp = str;
} }

8
usr.bin/mail/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.11 2000/09/19 01:12:48 christos Exp $ */ /* $NetBSD: main.c,v 1.12 2001/02/05 02:07:53 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/20/95"; static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/20/95";
#else #else
__RCSID("$NetBSD: main.c,v 1.11 2000/09/19 01:12:48 christos Exp $"); __RCSID("$NetBSD: main.c,v 1.12 2001/02/05 02:07:53 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -53,6 +53,8 @@ __RCSID("$NetBSD: main.c,v 1.11 2000/09/19 01:12:48 christos Exp $");
#include "extern.h" #include "extern.h"
extern char *version;
int main __P((int, char **)); int main __P((int, char **));
/* /*
@ -250,8 +252,6 @@ Usage: mail [-EiInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
if (setfile(ef) < 0) if (setfile(ef) < 0)
exit(1); /* error already reported */ exit(1); /* error already reported */
if (setjmp(hdrjmp) == 0) { if (setjmp(hdrjmp) == 0) {
extern char *version;
if ((prevint = signal(SIGINT, SIG_IGN)) != SIG_IGN) if ((prevint = signal(SIGINT, SIG_IGN)) != SIG_IGN)
signal(SIGINT, hdrstop); signal(SIGINT, hdrstop);
if (value("quiet") == NOSTR) if (value("quiet") == NOSTR)

7
usr.bin/mail/names.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: names.c,v 1.8 1998/12/19 16:33:40 christos Exp $ */ /* $NetBSD: names.c,v 1.9 2001/02/05 02:07:53 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)names.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)names.c 8.1 (Berkeley) 6/6/93";
#else #else
__RCSID("$NetBSD: names.c,v 1.8 1998/12/19 16:33:40 christos Exp $"); __RCSID("$NetBSD: names.c,v 1.9 2001/02/05 02:07:53 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -51,6 +51,8 @@ __RCSID("$NetBSD: names.c,v 1.8 1998/12/19 16:33:40 christos Exp $");
#include "rcv.h" #include "rcv.h"
#include "extern.h" #include "extern.h"
extern char *tempEdit;
/* /*
* Allocate a single element of a name list, * Allocate a single element of a name list,
* initialize its name field to the passed * initialize its name field to the passed
@ -229,7 +231,6 @@ outof(names, fo, hp)
char *date, *fname; char *date, *fname;
FILE *fout, *fin; FILE *fout, *fin;
int ispipe; int ispipe;
extern char *tempEdit;
top = names; top = names;
np = names; np = names;

9
usr.bin/mail/quit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: quit.c,v 1.11 2000/02/10 12:34:43 tron Exp $ */ /* $NetBSD: quit.c,v 1.12 2001/02/05 02:07:53 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)quit.c 8.2 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)quit.c 8.2 (Berkeley) 4/28/95";
#else #else
__RCSID("$NetBSD: quit.c,v 1.11 2000/02/10 12:34:43 tron Exp $"); __RCSID("$NetBSD: quit.c,v 1.12 2001/02/05 02:07:53 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -51,6 +51,9 @@ __RCSID("$NetBSD: quit.c,v 1.11 2000/02/10 12:34:43 tron Exp $");
* Termination processing. * Termination processing.
*/ */
extern char *tmpdir;
extern char *tempQuit, *tempResid;
/* /*
* The "quit" command. * The "quit" command.
*/ */
@ -79,7 +82,6 @@ quit()
FILE *ibuf = NULL, *obuf, *fbuf, *rbuf, *readstat = NULL, *abuf; FILE *ibuf = NULL, *obuf, *fbuf, *rbuf, *readstat = NULL, *abuf;
struct message *mp; struct message *mp;
int c; int c;
extern char *tempQuit, *tempResid;
struct stat minfo; struct stat minfo;
char *mbox; char *mbox;
@ -441,7 +443,6 @@ writeback(res)
void void
edstop() edstop()
{ {
extern char *tmpdir;
int gotcha, c; int gotcha, c;
struct message *mp; struct message *mp;
FILE *obuf, *ibuf, *readstat = NULL; FILE *obuf, *ibuf, *readstat = NULL;

7
usr.bin/mail/send.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: send.c,v 1.12 2000/09/19 01:12:48 christos Exp $ */ /* $NetBSD: send.c,v 1.13 2001/02/05 02:07:53 christos Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)send.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)send.c 8.1 (Berkeley) 6/6/93";
#else #else
__RCSID("$NetBSD: send.c,v 1.12 2000/09/19 01:12:48 christos Exp $"); __RCSID("$NetBSD: send.c,v 1.13 2001/02/05 02:07:53 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -51,6 +51,8 @@ __RCSID("$NetBSD: send.c,v 1.12 2000/09/19 01:12:48 christos Exp $");
* Mail to others. * Mail to others.
*/ */
extern char *tempMail;
/* /*
* Send message described by the passed pointer to the * Send message described by the passed pointer to the
* passed output buffer. Return -1 on error. * passed output buffer. Return -1 on error.
@ -448,7 +450,6 @@ infix(hp, fi)
struct header *hp; struct header *hp;
FILE *fi; FILE *fi;
{ {
extern char *tempMail;
FILE *nfo, *nfi; FILE *nfo, *nfi;
int c; int c;