diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-08-16 11:15:20 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-08-16 11:15:20 +0000 |
| commit | 0833839f60181af6fcf14de327d3ba2b30da8ed2 (patch) | |
| tree | af7f3254e70fb8ad910d460648f9af42c0210457 /usr/src/cmd/zlogin | |
| parent | adf665b5e735d87cf7d6b4e8932fb7dce88e42ad (diff) | |
| parent | d3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe (diff) | |
| download | illumos-joyent-0833839f60181af6fcf14de327d3ba2b30da8ed2.tar.gz | |
[illumos-gate merge]
commit d3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe
11528 Makefile.noget can get gone
11529 Use -Wno-maybe-initialized
commit c4ccc1f9004b70b07e4cdb57641c38ab607306c9
11226 Remove NetraCT support
commit dcfeff93f67a1188722a358e0fbfcd604993e573
11561 loader script needs to place .eh_frame after .text
commit a8ffe4975d219124d53dcd9de30126f3a595d28f
11555 gptzfsboot: boot prompt is not refreshed on device change
commit 79940ff6ac581ff9431c474dcfa18c78f1cb7a50
11556 ip_attr.c functions need to not dereference conn_ixa directly after lock drop
commit fe949611d4f0a0f42a6923a31cd3073e5b2bc97c
10540 wsdiff much slower under python3 than python2
commit c1064fd7ce62fe763a4475e9988ffea3b22137de
11541 allocation_classes feature must be enabled to add log device
Conflicts:
usr/src/uts/sparc/Makefile.sparc
usr/src/uts/intel/dev/Makefile
usr/src/uts/i86pc/pcie/Makefile
usr/src/cmd/zoneadmd/Makefile
Diffstat (limited to 'usr/src/cmd/zlogin')
| -rw-r--r-- | usr/src/cmd/zlogin/Makefile | 10 | ||||
| -rw-r--r-- | usr/src/cmd/zlogin/zlogin.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/cmd/zlogin/Makefile b/usr/src/cmd/zlogin/Makefile index 70ecb28c5c..a40f872ea4 100644 --- a/usr/src/cmd/zlogin/Makefile +++ b/usr/src/cmd/zlogin/Makefile @@ -21,22 +21,24 @@ # # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. # -# Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 Joyent, Inc. +# PROG = zlogin include ../Makefile.cmd -LINTFLAGS += -u LDLIBS += -lsocket -lzonecfg -lcontract -lbrand -lsecdb CFLAGS += $(CCVERBOSE) FILEMODE = 0555 -CERRWARN += -_gcc=-Wno-uninitialized +CERRWARN += $(CNOWARN_UNINIT) # not linted SMATCH=off +CSTD = $(CSTD_GNU99) + .KEEP_STATE: all: $(PROG) @@ -46,6 +48,4 @@ install: all $(ROOTUSRSBINPROG) clean: $(RM) $(OBJS) -lint: lint_PROG - include ../Makefile.targ diff --git a/usr/src/cmd/zlogin/zlogin.c b/usr/src/cmd/zlogin/zlogin.c index 1934ba2595..2c9d271abe 100644 --- a/usr/src/cmd/zlogin/zlogin.c +++ b/usr/src/cmd/zlogin/zlogin.c @@ -24,6 +24,7 @@ * Copyright (c) 2014 Gary Mills * Copyright 2016 Joyent, Inc. * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + * Copyright 2019 Joyent, Inc. */ /* @@ -678,7 +679,6 @@ process_user_input(int outfd, int infd) char ibuf[ZLOGIN_BUFSIZ]; int nbytes; char *buf = ibuf; - char c = *buf; nbytes = read(STDIN_FILENO, ibuf, ZLOGIN_RDBUFSIZ); if (nbytes == -1 && (errno != EINTR || dead)) @@ -691,7 +691,7 @@ process_user_input(int outfd, int infd) if (nbytes == 0) return (1); - for (c = *buf; nbytes > 0; c = *buf, --nbytes) { + for (char c = *buf; nbytes > 0; c = *buf, --nbytes) { buf++; if (beginning_of_line && !nocmdchar) { beginning_of_line = B_FALSE; |