33c33
< * $FreeBSD: head/usr.bin/mail/lex.c 74769 2001-03-25 04:57:05Z mikeh $
---
> * $FreeBSD: head/usr.bin/mail/lex.c 77274 2001-05-27 20:26:22Z mikeh $
41c41
< "$FreeBSD: head/usr.bin/mail/lex.c 74769 2001-03-25 04:57:05Z mikeh $";
---
> "$FreeBSD: head/usr.bin/mail/lex.c 77274 2001-05-27 20:26:22Z mikeh $";
55c55
< char *prompt = "& ";
---
> const char *prompt = "& ";
56a57,59
> extern const struct cmd cmdtab[];
> extern const char *version;
>
75,76c78,79
< if ((name = expand(name)) == NOSTR)
< return -1;
---
> if ((name = expand(name)) == NULL)
> return (-1);
82c85
< return(-1);
---
> return (-1);
87c90
< Fclose(ibuf);
---
> (void)Fclose(ibuf);
92c95
< Fclose(ibuf);
---
> (void)Fclose(ibuf);
118c121
< close(i);
---
> (void)close(i);
120,121c123,124
< fclose(itf);
< fclose(otf);
---
> (void)fclose(itf);
> (void)fclose(otf);
129c132,133
< snprintf(tempname, sizeof(tempname), "%s/mail.RxXXXXXXXXXX", tmpdir);
---
> (void)snprintf(tempname, sizeof(tempname),
> "%s/mail.RxXXXXXXXXXX", tmpdir);
132c136
< (void) fcntl(fileno(otf), F_SETFD, 1);
---
> (void)fcntl(fileno(otf), F_SETFD, 1);
135,136c139,140
< (void) fcntl(fileno(itf), F_SETFD, 1);
< rm(tempname);
---
> (void)fcntl(fileno(itf), F_SETFD, 1);
> (void)rm(tempname);
139c143
< Fclose(ibuf);
---
> (void)Fclose(ibuf);
145c149
< return -1;
---
> return (-1);
147c151
< return(0);
---
> return (0);
160,161c164
< int eofloop = 0;
< register int n;
---
> int n, eofloop = 0;
163d165
< void intr(), stop(), hangup();
167c169
< signal(SIGINT, intr);
---
> (void)signal(SIGINT, intr);
169,172c171,174
< signal(SIGHUP, hangup);
< signal(SIGTSTP, stop);
< signal(SIGTTOU, stop);
< signal(SIGTTIN, stop);
---
> (void)signal(SIGHUP, hangup);
> (void)signal(SIGTSTP, stop);
> (void)signal(SIGTTOU, stop);
> (void)signal(SIGTTIN, stop);
180c182
< if (!sourcing && value("interactive") != NOSTR) {
---
> if (!sourcing && value("interactive") != NULL) {
184c186
< fflush(stdout);
---
> (void)fflush(stdout);
213,214c215,216
< if (value("interactive") != NOSTR &&
< value("ignoreeof") != NOSTR &&
---
> if (value("interactive") != NULL &&
> value("ignoreeof") != NULL &&
241,244c243,245
< struct cmd *com;
< register char *cp, *cp2;
< register int c;
< int muvec[2];
---
> const struct cmd *com;
> char *cp, *cp2;
> int c, muvec[2];
264c265
< return(0);
---
> return (0);
267c268
< while (*cp && strchr(" \t0123456789$^.:/-+*'\"", *cp) == NOSTR)
---
> while (*cp != '\0' && strchr(" \t0123456789$^.:/-+*'\"", *cp) == NULL)
280c281
< return(0);
---
> return (0);
282c283
< if (com == NONE) {
---
> if (com == NULL) {
293,294c294,295
< if (cond == CRCV && !rcvmode || cond == CSEND && rcvmode)
< return(0);
---
> if ((cond == CRCV && !rcvmode) || (cond == CSEND && rcvmode))
> return (0);
335,336c336
< *msgvec = first(com->c_msgflag,
< com->c_msgmask);
---
> *msgvec = first(com->c_msgflag, com->c_msgmask);
375c375
< sizeof arglist / sizeof *arglist)) < 0)
---
> sizeof(arglist) / sizeof(*arglist))) < 0)
379c379
< com->c_name, com->c_minargs);
---
> com->c_name, com->c_minargs);
384c384
< com->c_name, com->c_maxargs);
---
> com->c_name, com->c_maxargs);
409c409
< return 1;
---
> return (1);
411c411
< return 1;
---
> return (1);
414c414
< return 0;
---
> return (0);
416c416
< if (value("autoprint") != NOSTR && com->c_argtype & P)
---
> if (value("autoprint") != NULL && com->c_argtype & P)
424c424
< return(0);
---
> return (0);
437,438c437,438
< free((char *) msgvec);
< msgvec = (int *) calloc((unsigned) (sz + 1), sizeof *msgvec);
---
> (void)free(msgvec);
> msgvec = calloc((unsigned)(sz + 1), sizeof(*msgvec));
446c446
< struct cmd *
---
> __const struct cmd *
450,451c450
< register struct cmd *cp;
< extern struct cmd cmdtab[];
---
> const struct cmd *cp;
454c453
< * ignore trailing chars after `#'
---
> * ignore trailing chars after `#'
464c463
< for (cp = &cmdtab[0]; cp->c_name != NOSTR; cp++)
---
> for (cp = &cmdtab[0]; cp->c_name != NULL; cp++)
466,467c465,466
< return(cp);
< return(NONE);
---
> return (cp);
> return (NULL);
476c475
< char *as1, *as2;
---
> const char *as1, *as2;
478c477
< register char *s1, *s2;
---
> const char *s1, *s2;
484,485c483,484
< return(1);
< return(*--s1 == '\0');
---
> return (1);
> return (*--s1 == '\0');
514c513
< close(image);
---
> (void)close(image);
530,533c529,532
< sigsetmask(sigblock(0) & ~sigmask(s));
< kill(0, s);
< sigblock(sigmask(s));
< signal(s, old_action);
---
> (void)sigsetmask(sigblock(0) & ~sigmask(s));
> (void)kill(0, s);
> (void)sigblock(sigmask(s));
> (void)signal(s, old_action);
566c565
< if (msgCount > 0 && value("noheader") == NOSTR) {
---
> if (msgCount > 0 && value("noheader") == NULL) {
580,581c579,580
< register struct message *mp;
< register int u, n, mdot, d, s;
---
> struct message *mp;
> int u, n, mdot, d, s;
610c609,610
< snprintf(zname, sizeof(zname), "+%s", mailname + strlen(fname));
---
> (void)snprintf(zname, sizeof(zname), "+%s",
> mailname + strlen(fname));
630c630
< return(mdot);
---
> return (mdot);
642d641
< extern char *version;
645c644
< return(0);
---
> return (0);
655c654
< register FILE *in, *oldin;
---
> FILE *in, *oldin;
667c666
< Fclose(in);
---
> (void)Fclose(in);