diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-24 14:34:58 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-07-11 18:08:37 +0300 |
| commit | 46d64c14791e94efc5b1534ccf8db76ed1fadcfc (patch) | |
| tree | 3465e3e5a4a2cc166ac2ec424bb58a8570948bd9 /usr/src/cmd/mailx/cmd4.c | |
| parent | 5521b7639b10e877e2e517a3498114aaf131b72d (diff) | |
| download | illumos-joyent-46d64c14791e94efc5b1534ccf8db76ed1fadcfc.tar.gz | |
11335 mailx: NULL pointer errors
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/mailx/cmd4.c')
| -rw-r--r-- | usr/src/cmd/mailx/cmd4.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/usr/src/cmd/mailx/cmd4.c b/usr/src/cmd/mailx/cmd4.c index 7daca54ad9..14e4c565fe 100644 --- a/usr/src/cmd/mailx/cmd4.c +++ b/usr/src/cmd/mailx/cmd4.c @@ -38,8 +38,6 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "rcv.h" #include <locale.h> @@ -59,13 +57,13 @@ static char *stripquotes(char *str); int dopipe(char str[]) { - register int *ip, mesg; - register struct message *mp; + int *ip, mesg; + struct message *mp; char *cp, *cmd; int f, *msgvec, nowait=0; void (*sigint)(int), (*sigpipe)(int); long lc, cc, t; - register pid_t pid; + pid_t pid; int page, s, pivec[2]; char *Shell; FILE *pio = NULL; @@ -85,11 +83,11 @@ dopipe(char str[]) } if (!f) { *msgvec = first(0, MMNORM); - if (*msgvec == NULL) { + if (*msgvec == 0) { printf(gettext("No messages to pipe.\n")); return(1); } - msgvec[1] = NULL; + msgvec[1] = 0; } if (f && getmsglist(str, msgvec, 0) < 0) return(1); @@ -190,7 +188,7 @@ loadmsg(char str[]) { char *file; int f, *msgvec; - register int c, lastc = '\n'; + int c, lastc = '\n'; int blank; int lines; long ms; @@ -205,15 +203,15 @@ loadmsg(char str[]) return(1); if (!f) { *msgvec = first(0, MMNORM); - if (*msgvec == NULL) { + if (*msgvec == 0) { printf(gettext("No message to load into.\n")); return(1); } - msgvec[1] = NULL; + msgvec[1] = 0; } if (f && getmsglist(str, msgvec, 0) < 0) return(1); - if (msgvec[1] != NULL) { + if (msgvec[1] != 0) { printf(gettext("Can only load into a single message.\n")); return(1); } @@ -266,9 +264,9 @@ loadmsg(char str[]) int field(char str[]) { - register int *ip; - register struct message *mp; - register char *cp, *fld; + int *ip; + struct message *mp; + char *cp, *fld; int f, *msgvec; msgvec = (int *) salloc((msgCount + 2) * sizeof *msgvec); @@ -281,11 +279,11 @@ field(char str[]) } if (!f) { *msgvec = first(0, MMNORM); - if (*msgvec == NULL) { + if (*msgvec == 0) { printf(gettext("No messages to display.\n")); return(1); } - msgvec[1] = NULL; + msgvec[1] = 0; } if (f && getmsglist(str, msgvec, 0) < 0) return(1); @@ -307,7 +305,7 @@ field(char str[]) static char * stripquotes(char *str) { - register int lastch; + int lastch; if (str == NOSTR) { return(NOSTR); } |