diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-11 13:13:38 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-11 13:13:38 +0000 |
| commit | cbabb52cbef55dc12ac62bb5e5da7cc02cf114d2 (patch) | |
| tree | 9b95d76ec1eaca7a5112c582f7f176891a918e1c /usr/src/cmd/echo/echo.c | |
| parent | e790b92538e616017d45a87be045bccb1a3c8758 (diff) | |
| parent | 36ac8d7d925ed80286cf13327142ca1fa6943fc3 (diff) | |
| download | illumos-joyent-cbabb52cbef55dc12ac62bb5e5da7cc02cf114d2.tar.gz | |
[illumos-gate merge]
commit 36ac8d7d925ed80286cf13327142ca1fa6943fc3
10119 audit(1) gets NULL check wrong
commit dbef1f18aebff7758796283d40875419be721c2b
10510 loader: bios comc_probe() is out of sync with uefi version
commit 7b38fab6300e0a1599b9741cfeafd94d362b87aa
9433 Fix ARC hit rate
commit bc54f855e0de1e590115101c80f152a20722cfb0
10120 smatch indenting fixes for usr/src/cmd
Diffstat (limited to 'usr/src/cmd/echo/echo.c')
| -rw-r--r-- | usr/src/cmd/echo/echo.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/usr/src/cmd/echo/echo.c b/usr/src/cmd/echo/echo.c index ebd8e3868b..e9f9027203 100644 --- a/usr/src/cmd/echo/echo.c +++ b/usr/src/cmd/echo/echo.c @@ -25,6 +25,9 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ #include <stdio.h> #include <stdlib.h> @@ -55,16 +58,16 @@ main(int argc, char *argv[]) for (i = 1; i <= argc; i++) { for (cp = argv[i], ep = cp + (int)strlen(cp); cp < ep; cp += b_len) { - if ((b_len = mbtowc(&wc, cp, MB_CUR_MAX)) <= 0) { - (void) putchar(*cp); - b_len = 1; - continue; - } + if ((b_len = mbtowc(&wc, cp, MB_CUR_MAX)) <= 0) { + (void) putchar(*cp); + b_len = 1; + continue; + } - if (wc != '\\') { - (void) putwchar(wc); - continue; - } + if (wc != '\\') { + (void) putwchar(wc); + continue; + } cp += b_len; b_len = 1; |