diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-07-09 11:44:10 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-07-09 11:44:10 +0000 |
| commit | a6fadc5b8524bc403c026a620fd325448da8f28f (patch) | |
| tree | bc8617e28b65fa4ec413fc13be6200eb3225b035 /usr/src/cmd/expr/expr.c | |
| parent | b322ba367cdb75882f1cede5a8b22c7fd17ced94 (diff) | |
| parent | 6f2b04a2ce785423fe988216ae694366499884b2 (diff) | |
| download | illumos-joyent-a6fadc5b8524bc403c026a620fd325448da8f28f.tar.gz | |
[illumos-gate merge]
commit 6f2b04a2ce785423fe988216ae694366499884b2
11304 cmd-crypto: NULL pointer errors
commit 19803d096124c0f1ca62906eb328234556bfad35
11303 cron: NULL pointer errors
commit a3ab7e857d66d206fcfc56f9a628266bd25a7bd0
11319 devfsadm: NULL pointer errors
commit 1fbb7a7c3b62c369349ec1774806ed321e4f6119
11332 Regression: 11184 causes kernel hang during boot on CPUs without ARAT
commit 62efa0e74455f83caa0fa7df8926a5ec9656b3ce
11213 tem: partially support CSI [ 38 and 48 sequences with smaller depths
commit 023a3eeed3dc3724c83a2c43af879ce1719b2e32
11324 expr: NULL pointer errors
commit c7cb3c8ba9fee2d8fc1a3ba06662ed84679fbd66
11323 syseventd: NULL pointer errors
commit 1a80a7c52201c03ace9f85bdb77b768062b06136
11322 dfs.cmds: NULL pointer errors
commit 8f32bfdc833ff8990921fa7b28a4d6bd970ef98f
11290 captoinfo: NULL pointer errors
commit 84bdd7fe0904e8a6527441769054b6bc92a1ffe0
10329 Remove scsi_vhci_f_asym_sun (StorEdge T3 support)
commit f9d4be10f65289547fa67ea8d1a3de54596b3ba1
11300 cpustat: NULL pointer errors
Diffstat (limited to 'usr/src/cmd/expr/expr.c')
| -rw-r--r-- | usr/src/cmd/expr/expr.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/usr/src/cmd/expr/expr.c b/usr/src/cmd/expr/expr.c index 873d7bc3f7..2685241a0e 100644 --- a/usr/src/cmd/expr/expr.c +++ b/usr/src/cmd/expr/expr.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* @@ -70,10 +70,6 @@ static void yyerror(char *); static void errxx(); static void *exprmalloc(size_t size); -long atol(); -char *strcpy(), *strncpy(); -void exit(); - static char *ltoa(); static char *lltoa(); static char **Av; @@ -112,8 +108,7 @@ static int pri[] = { * numeric output, e.g., -00001 becomes -1 */ static void -clean_buf(buf) - char *buf; +clean_buf(char *buf) { int i = 0; int is_a_num = 1; @@ -388,7 +383,7 @@ match(char *s, char *p) /* - * ematch - XCU4 mods involve calling compile/advance which simulate + * ematch - XCU4 mods involve calling compile/advance which simulate * the obsolete compile/advance functions using regcomp/regexec */ static int @@ -441,7 +436,7 @@ ematch(char *s, char *p) } memcpy(tmptr, s, nmatch); *(tmptr + nmatch) = '\0'; - if ((nmbchars = mbstowcs(NULL, tmptr, NULL)) == -1) { + if ((nmbchars = mbstowcs(NULL, tmptr, 0)) == -1) { yyerror("invalid multibyte character encountered"); if (tmptr1 != NULL) free(tmptr1); |