diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-15 12:12:29 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-15 12:12:29 +0000 |
| commit | c6493650bb8171db31ebebfa92d9a19dd0fe3e82 (patch) | |
| tree | 10c4297767192fd3b51eef9cf8218138defded87 | |
| parent | 4f3af6ac0e7bc423c116341136c1757ff948a506 (diff) | |
| parent | 9fed930b55df5aeaba1280325625a29e78199a54 (diff) | |
| download | illumos-joyent-c6493650bb8171db31ebebfa92d9a19dd0fe3e82.tar.gz | |
[illumos-gate merge]
commit 9fed930b55df5aeaba1280325625a29e78199a54
9367 troff: comparison between pointer and zero character constant
| -rw-r--r-- | usr/src/cmd/troff/n1.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/usr/src/cmd/troff/n1.c b/usr/src/cmd/troff/n1.c index 889c886418..f1f2f00134 100644 --- a/usr/src/cmd/troff/n1.c +++ b/usr/src/cmd/troff/n1.c @@ -37,9 +37,6 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - -char *xxxvers = "@(#)roff:n1.c 2.13"; /* * n1.c * @@ -107,7 +104,7 @@ main(int argc, char **argv) tchar i; int eileenct; /*count to test for "Eileen's loop"*/ extern void catch(), kcatch(); - char **oargv, *getenv(); + char **oargv; (void)setlocale(LC_ALL, ""); #if !defined(TEXT_DOMAIN) @@ -145,7 +142,7 @@ main(int argc, char **argv) strcpy(fontfile, &argv[0][2]); } else { argv++; argc--; - if (argv[0] != '\0') { + if (argv[0] != NULL) { strcpy(termtab, argv[0]); strcpy(fontfile, argv[0]); } else @@ -181,11 +178,12 @@ main(int argc, char **argv) ptid = 1; continue; case 'r': - if (&argv[0][2] != '\0' && strlen(&argv[0][2]) >= 2 && &argv[0][3] != '\0') - eibuf = roff_sprintf(ibuf+strlen(ibuf), ".nr %c %s\n", - argv[0][2], &argv[0][3]); - else + if (strlen(&argv[0][2]) >= 2) { + eibuf = roff_sprintf(ibuf+strlen(ibuf), + ".nr %c %s\n", argv[0][2], &argv[0][3]); + } else { errprint(gettext("wrong options")); + } continue; case 'c': case 'm': @@ -198,7 +196,8 @@ main(int argc, char **argv) errprint(gettext("No library provided with -m")); done(02); } - if (getenv("TROFFMACS") != '\0') { + p = getenv("TROFFMACS"); + if (p != NULL && *p != '\0') { if (tryfile(getenv("TROFFMACS"), &argv[0][2], nmfi)) nmfi++; } else |