diff options
author | Cody Peter Mello <cody.mello@joyent.com> | 2019-08-21 17:17:53 -0700 |
---|---|---|
committer | Joshua M. Clulow <josh@sysmgr.org> | 2020-04-06 17:55:12 -0700 |
commit | e9753c805d68532dc7d35057f2b3d5a52cd23c81 (patch) | |
tree | 7159a93f5a47763b903132f9f18d04712b128538 | |
parent | de6af22ae73ba8d72672288621ff50b88f2cf5fd (diff) | |
download | illumos-gate-e9753c805d68532dc7d35057f2b3d5a52cd23c81.tar.gz |
11551 Clean up nawk(1) usage in illumos-gate
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Gordon Ross <gwr@nexenta.com>
-rw-r--r-- | usr/src/lib/brand/solaris10/zone/p2v.ksh | 2 | ||||
-rw-r--r-- | usr/src/lib/libsecdb/common/i.rbac | 2 | ||||
-rw-r--r-- | usr/src/lib/libxcurses/src/libc/xcurses/mkkey.awk | 6 | ||||
-rw-r--r-- | usr/src/lib/libxcurses/src/libc/xcurses/mkterm.awk | 58 | ||||
-rw-r--r-- | usr/src/lib/libxcurses2/src/libc/xcurses/mkkey.awk | 8 | ||||
-rw-r--r-- | usr/src/lib/libxcurses2/src/libc/xcurses/mkterm.awk | 40 |
6 files changed, 58 insertions, 58 deletions
diff --git a/usr/src/lib/brand/solaris10/zone/p2v.ksh b/usr/src/lib/brand/solaris10/zone/p2v.ksh index f1d8711073..19fc23190b 100644 --- a/usr/src/lib/brand/solaris10/zone/p2v.ksh +++ b/usr/src/lib/brand/solaris10/zone/p2v.ksh @@ -458,7 +458,7 @@ warn_zones() NGZ=$(/usr/bin/nawk -F: '{ if (substr($1, 0, 1) == "#" || $1 == "global") - continue + next if ($2 == "installed") printf("%s ", $1) diff --git a/usr/src/lib/libsecdb/common/i.rbac b/usr/src/lib/libsecdb/common/i.rbac index 0b20be0356..0ed2cc1cde 100644 --- a/usr/src/lib/libsecdb/common/i.rbac +++ b/usr/src/lib/libsecdb/common/i.rbac @@ -242,7 +242,7 @@ FNR == 1 { } /^#/ || /^$/ { - continue; + next; } { diff --git a/usr/src/lib/libxcurses/src/libc/xcurses/mkkey.awk b/usr/src/lib/libxcurses/src/libc/xcurses/mkkey.awk index cfa5122722..0a771c81e0 100644 --- a/usr/src/lib/libxcurses/src/libc/xcurses/mkkey.awk +++ b/usr/src/lib/libxcurses/src/libc/xcurses/mkkey.awk @@ -48,15 +48,15 @@ print " *" print " * Copyright 1990, 1995 by Mortice Kern Systems Inc. All rights reserved." print " *" print " */" -print +print "" print "#if M_RCSID" print "#ifndef lint" printf "static char rcsID[] = \"$Header%s\";\n", "$" print "#endif" print "#endif" -print +print "" print "#include <private.h>" -print +print "" print "/*" print " * This table is used to map a KEY_ constant to an" print " * index for cur_term->_str[] for use by keyname()." diff --git a/usr/src/lib/libxcurses/src/libc/xcurses/mkterm.awk b/usr/src/lib/libxcurses/src/libc/xcurses/mkterm.awk index f224922113..361bc7e0dd 100644 --- a/usr/src/lib/libxcurses/src/libc/xcurses/mkterm.awk +++ b/usr/src/lib/libxcurses/src/libc/xcurses/mkterm.awk @@ -49,12 +49,12 @@ print " * Copyright 1990, 1995 by Mortice Kern Systems Inc. All rights reserved print " *" printf " * $Header%s\n", "$" print " */" -print +print "" print "#ifndef __term_h__" print "#define __term_h__\t1" -print +print "" print "#define _XOPEN_CURSES" -print +print "" print "#ifndef NCCS" print "#include <termios.h>" print "#endif" @@ -62,7 +62,7 @@ print "#ifndef STDIN_FILENO" print "#include <sys/types.h>" print "#include <unistd.h>" print "#endif" -print +print "" print "#define __TERM cur_term->" } @@ -79,11 +79,11 @@ $4 == "str" { } END { -print +print "" printf "#define __COUNT_BOOL\t\t%d\n", BoolCount printf "#define __COUNT_NUM\t\t%d\n", NumberCount printf "#define __COUNT_STR\t\t%d\n", StringCount -print +print "" print "/*" print " * MKS Header format for terminfo database files." print " *" @@ -101,9 +101,9 @@ print " * Between the boolean and number sections, a null byte is inserted, if" print " * necessary, to ensure that the number section begins on an even byte" print " * offset. All short integers are aligned on a short word boundary." print " */" -print +print "" print "#define __TERMINFO_MAGIC\t\t0432" -print +print "" print "typedef struct {" print "\tshort magic;" print "\tshort name_size;" @@ -112,7 +112,7 @@ print "\tshort num_count;" print "\tshort str_count;" print "\tshort str_size;" print "} terminfo_header_t;" -print +print "" print "/*" print " * The following __MOVE_ constants are indices into the _move[] member" print " * of a SCREEN structure. The array is used by m_mvcur() for cursor" @@ -127,16 +127,16 @@ print "#define __MOVE_LEFT\t\t2" print "#define __MOVE_RIGHT\t\t3" print "#define __MOVE_TAB\t\t4" print "#define __MOVE_BACK_TAB\t\t5" -print +print "" print "#define __MOVE_MAX_RELATIVE\t6" -print +print "" print "/*" print " * These should have fixed costs." print " */" print "#define __MOVE_RETURN\t\t6" print "#define __MOVE_HOME\t\t7" print "#define __MOVE_LAST_LINE\t8" -print +print "" print "/*" print " * These have worst case cost based on moving the maximum possible" print " * value for a parameter given the screen size." @@ -148,20 +148,20 @@ print "#define __MOVE_N_RIGHT\t\t12" print "#define __MOVE_ROW\t\t13" print "#define __MOVE_COLUMN\t\t14" print "#define __MOVE_ROW_COLUMN\t15" -print +print "" print "#define __MOVE_MAX\t\t16" -print +print "" print "/*" print " * For a cursor motion to be used there must be a base-cost of at least 1." print " */" print "#define __MOVE_INFINITY\t\t1000" -print +print "" print "#define __TERM_ISATTY_IN\t0x0001\t/* Input is a terminal */" print "#define __TERM_ISATTY_OUT\t0x0002\t/* Output is a terminal */" print "#define __TERM_HALF_DELAY\t0x0004\t/* halfdelay() has priority. */" print "#define __TERM_INSERT_MODE\t0x0008\t/* Terminal is in insert mode. */" print "#define __TERM_NL_IS_CRLF\t0x8000\t/* Newline is mapped on output. */" -print +print "" print "/***" print " *** Opaque data type. Keep your grubby mits off." print " ***/" @@ -187,9 +187,9 @@ print "\t\tchar *_seq;" print "\t\tshort _cost;" print "\t} _move[__MOVE_MAX];" print "} TERMINAL;" -print +print "" print "extern TERMINAL *cur_term;" -print +print "" print "extern char *__m_boolnames[];" print "extern char *__m_boolcodes[];" print "extern char *__m_boolfnames[];" @@ -199,7 +199,7 @@ print "extern char *__m_numfnames[];" print "extern char *__m_strnames[];" print "extern char *__m_strcodes[];" print "extern char *__m_strfnames[];" -print +print "" print "#ifndef _XOPEN_SOURCE" print "/*" print " * Old System V array names." @@ -214,7 +214,7 @@ print "#define strnames\t__m_strnames" print "#define strcodes\t__m_strcodes" print "#define strfnames\t__m_strfnames" print "#endif /* _XOPEN_SOURCE */" -print +print "" print "/*" print " * Exposed internal functions." print " */" @@ -222,7 +222,7 @@ print "extern int __m_putchar(int);" print "extern int __m_mvcur(int, int, int, int, int (*)(int));" print "extern int __m_read_terminfo(const char *, TERMINAL *);" print "extern int __m_setupterm(const char *, int, int, int *);" -print +print "" print "/*" print " * Globals" print " */" @@ -230,35 +230,35 @@ print "extern int del_curterm(TERMINAL *);" print "extern TERMINAL *set_curterm(TERMINAL *);" print "extern int restartterm(const char *, int, int *);" print "extern int setupterm(const char *, int, int *);" -print +print "" print "extern int tgetent(char *, char *);" print "extern int tgetflag(const char *);" print "extern int tgetnum(const char *);" print "extern char *tgetstr(const char *, char **);" print "extern char *tgoto(const char *, int, int);" -print +print "" print "extern int tigetflag(const char *);" print "extern int tigetnum(const char *);" print "extern char *tigetstr(const char *);" -print +print "" print "extern int putp(const char *);" print "extern const char *tparm(" print "\tconst char *, long, long, long, long, long, long, long, long, long);" print "extern int tputs(const char *, int, int (*)(int));" -print +print "" print "#ifndef _XOPEN_SOURCE_EXTENDED" -print +print "" print "#define putp(str)\t\ttputs(str,1,__m_putchar)" print "#define del_term\t\tdel_curterm" print "#define setterm(t)\t\tsetupterm(t,STDOUT_FILENO,(int *) 0)" print "#define tgoto(cm,c,r)\t\ttparm((char *)(cm), (long)(r), (long)(c))" -print +print "" print "#ifndef _XOPEN_SOURCE" print "#define beehive_glitch\t\tno_esc_ctrlc" print "#define teleray_glitch\t\tdest_tabs_magic_smso" print "#endif /* _XOPEN_SOURCE */" -print +print "" print "#endif /* _XOPEN_SOURCE_EXTENDED */" -print +print "" print "#endif /* __term_h__ */" } diff --git a/usr/src/lib/libxcurses2/src/libc/xcurses/mkkey.awk b/usr/src/lib/libxcurses2/src/libc/xcurses/mkkey.awk index c1df0d7ad5..24a0ff8f71 100644 --- a/usr/src/lib/libxcurses2/src/libc/xcurses/mkkey.awk +++ b/usr/src/lib/libxcurses2/src/libc/xcurses/mkkey.awk @@ -41,9 +41,9 @@ print "/*" print " * Copyright (c) 1998 by Sun Microsystems, Inc." print " * All rights reserved." print " */" -print +print "" print "#pragma ident \"@(#)keyindex.c\t%I%\t%E% SMI\"" -print +print "" print "/*" print " * keyindex.c" print " *" @@ -55,9 +55,9 @@ print " *" print " * Copyright 1990, 1995 by Mortice Kern Systems Inc. All rights reserved." print " *" print " */" -print +print "" print "#include <private.h>" -print +print "" print "/*" print " * This table is used to map a KEY_ constant to an" print " * index for cur_term->_str[] for use by keyname()." diff --git a/usr/src/lib/libxcurses2/src/libc/xcurses/mkterm.awk b/usr/src/lib/libxcurses2/src/libc/xcurses/mkterm.awk index e32a6404ba..9dea31c85c 100644 --- a/usr/src/lib/libxcurses2/src/libc/xcurses/mkterm.awk +++ b/usr/src/lib/libxcurses2/src/libc/xcurses/mkterm.awk @@ -41,12 +41,12 @@ print "/*" print " * Copyright (c) 1998 by Sun Microsystems, Inc." print " * All rights reserved." print " */" -print +print "" print "#ifndef _TERM_H" print "#define _TERM_H" -print +print "" print "#pragma ident \"@(#)term.h %I% %E% SMI\"" -print +print "" print "/*" print " * term.h" print " *" @@ -59,12 +59,12 @@ print " * Copyright 1990, 1995 by Mortice Kern Systems Inc. All rights reserved print " *" printf " * $Header%s\n", "$" print " */" -print -print +print "" +print "" print "#ifdef __cplusplus" print "extern \"C\" {" print "#endif" -print +print "" print "#define __TERM cur_term->" } @@ -81,11 +81,11 @@ $4 == "str" { } END { -print +print "" printf "#define __COUNT_BOOL\t\t%d\n", BoolCount printf "#define __COUNT_NUM\t\t%d\n", NumberCount printf "#define __COUNT_STR\t\t%d\n", StringCount -print +print "" #print "/*" #print " * MKS Header format for terminfo database files." #print " *" @@ -129,16 +129,16 @@ print "#define __MOVE_LEFT\t\t2" print "#define __MOVE_RIGHT\t\t3" print "#define __MOVE_TAB\t\t4" print "#define __MOVE_BACK_TAB\t\t5" -print +print "" print "#define __MOVE_MAX_RELATIVE\t6" -print +print "" print "/*" print " * These should have fixed costs." print " */" print "#define __MOVE_RETURN\t\t6" print "#define __MOVE_HOME\t\t7" print "#define __MOVE_LAST_LINE\t8" -print +print "" print "/*" print " * These have worst case cost based on moving the maximum possible" print " * value for a parameter given the screen size." @@ -150,20 +150,20 @@ print "#define __MOVE_N_RIGHT\t\t12" print "#define __MOVE_ROW\t\t13" print "#define __MOVE_COLUMN\t\t14" print "#define __MOVE_ROW_COLUMN\t15" -print +print "" print "#define __MOVE_MAX\t\t16" -print +print "" print "/*" print " * For a cursor motion to be used there must be a base-cost of at least 1." print " */" print "#define __MOVE_INFINITY\t\t1000" -print +print "" print "#define __TERM_ISATTY_IN\t0x0001\t/* Input is a terminal */" print "#define __TERM_ISATTY_OUT\t0x0002\t/* Output is a terminal */" print "#define __TERM_HALF_DELAY\t0x0004\t/* halfdelay() has priority. */" print "#define __TERM_INSERT_MODE\t0x0008\t/* Terminal is in insert mode. */" print "#define __TERM_NL_IS_CRLF\t0x8000\t/* Newline is mapped on output. */" -print +print "" print "/*" print " * Opaque data type. Keep your grubby mits off." print " */" @@ -194,16 +194,16 @@ print "\t\tchar *_seq;" print "\t\tshort _cost;" print "\t} _move[__MOVE_MAX];" print "} TERMINAL;" -print +print "" print "extern TERMINAL *cur_term;" -print +print "" print "#if !(defined(__cplusplus) && defined(_BOOL))" print "#ifndef _BOOL_DEFINED" print "typedef short bool;" print "#define _BOOL_DEFINED" print "#endif" print "#endif" -print +print "" print "/*" print " * Globals" print " */" @@ -223,10 +223,10 @@ print "extern char *tigetstr(char *);" print "extern char *tparm(" print "\tchar *, long, long, long, long, long, long, long, long, long);" print "extern int tputs(const char *, int, int (*)(int));" -print +print "" print "#ifdef __cplusplus" print "}" print "#endif" -print +print "" print "#endif /* _TERM_H */" } |