6117 Many small bugs prevent a clean build on SPARC

Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

11 files changed, 175 insertions, 54 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index ed6f663d61..dd6b058b66 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -24,6 +24,7 @@
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
+# Copyright 2015 Gary Mills
 #
 
 #
@@ -149,7 +150,7 @@ CP=		/usr/bin/cp -f
 MCS=		/usr/ccs/bin/mcs
 CAT=            /usr/bin/cat
 ELFDUMP=	/usr/ccs/bin/elfdump
-M4=		/usr/ccs/bin/m4
+M4=		/usr/bin/m4
 STRIP=		/usr/ccs/bin/strip
 LEX=		/usr/ccs/bin/lex
 FLEX=		/usr/bin/flex
diff --git a/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile b/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile
new file mode 100644
index 0000000000..640aecfa3a
--- /dev/null
+++ b/usr/src/cmd/mdb/sparc/v7/libfksmbsrv/Makefile
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+# Copyright 2015 Gary Mills
+#
+
+MODULE = libfksmbsrv.so
+MDBTGT = proc
+
+MODSRCS = smbsrv.c list.c
+
+include ../../../../Makefile.cmd
+include ../../Makefile.sparcv7
+include ../../../Makefile.module
+
+MODSRCS_DIR = ../../../common/modules/smbsrv
+GENUNIX_DIR = ../../../common/modules/genunix
+
+# Note: need our sys includes _before_ ENVCPPFLAGS, proto etc.
+CPPFLAGS.first += -I../../../../../lib/smbsrv/libfksmbsrv/common
+CPPFLAGS.first += -I../../../../../lib/libfakekernel/common
+
+CPPFLAGS += -I../../../../../uts/common
+
+C99MODE=	-xc99=%all
+C99LMODE=	-Xc99=%all
+
+dmod/%.o: $(GENUNIX_DIR)/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
+dmod/%.ln: $(GENUNIX_DIR)/%.c
+	$(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile b/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile
new file mode 100644
index 0000000000..480f9a8126
--- /dev/null
+++ b/usr/src/cmd/mdb/sparc/v9/libfksmbsrv/Makefile
@@ -0,0 +1,57 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+# Copyright 2015 Gary Mills
+#
+
+MODULE = libfksmbsrv.so
+MDBTGT = proc
+
+MODSRCS = smbsrv.c list.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+MODSRCS_DIR = ../../../common/modules/smbsrv
+GENUNIX_DIR = ../../../common/modules/genunix
+
+# Note: need our sys includes _before_ ENVCPPFLAGS, proto etc.
+CPPFLAGS.first += -I../../../../../lib/smbsrv/libfksmbsrv/common
+CPPFLAGS.first += -I../../../../../lib/libfakekernel/common
+
+CPPFLAGS += -I../../../../../uts/common
+
+C99MODE=	-xc99=%all
+C99LMODE=	-Xc99=%all
+
+dmod/%.o: $(GENUNIX_DIR)/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
+dmod/%.ln: $(GENUNIX_DIR)/%.c
+	$(LINT.c) -c $<
diff --git a/usr/src/cmd/sgs/lex/Makefile.com b/usr/src/cmd/sgs/lex/Makefile.com
index d33a882296..15169ec277 100644
--- a/usr/src/cmd/sgs/lex/Makefile.com
+++ b/usr/src/cmd/sgs/lex/Makefile.com
@@ -19,6 +19,7 @@
 # CDDL HEADER END
 #
 #
+# Copyright 2015 Gary Mills
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -58,7 +59,12 @@ SRCS=		$(MACHSRCS) $(LIBSRCS)
 
 LIBS =          $(DYNLIB) $(LINTLIB)
 
+# Append to LINTFLAGS and LINTFLAGS64 from lib/Makefile.lib
+LINTFLAGS +=	-erroff=E_NAME_MULTIPLY_DEF2 -erroff=E_FUNC_RET_MAYBE_IGNORED2
+LINTFLAGS64 +=	-erroff=E_NAME_MULTIPLY_DEF2 -erroff=E_FUNC_RET_MAYBE_IGNORED2
+
 LINTSRCS=	../common/llib-l$(LIBNAME)
+$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 INCLIST=	$(INCLIST_$(MACH)) -I../../include -I../../include/$(MACH)
 DEFLIST=	-DELF
@@ -76,10 +82,9 @@ pics/%_e.o:=	DEFLIST = -DEUC -DJLSLEX  -DEOPTION -D$*=$*_e
 
 CPPFLAGS=	$(INCLIST) $(DEFLIST) $(CPPFLAGS.master)
 BUILD.AR=	$(AR) $(ARFLAGS) $@ `$(LORDER) $(OBJS) | $(TSORT)`
-LINTFLAGS=	-amux
+
 LINTPOUT=	lint.out
 
-$(LINTLIB):=	LINTFLAGS = -nvx
 $(ROOTPROG):=	FILEMODE = 0555
 
 ROOTFORMS=	$(FORMS:%=$(ROOTSHLIBCCS)/%)
@@ -94,7 +99,9 @@ DYNLINKLIB=	$(LIBLINKS:%=$(DYNLINKLIBDIR)/%)
 $(DYNLIB) :=	CFLAGS += $(CCVERBOSE)
 $(DYNLIB) :=	CFLAGS64 += $(CCVERBOSE)
 
-$(DYNLIB) :=	LDLIBS += -lc
+LDLIBS += -lc
 
 CLEANFILES +=	../common/parser.c $(LINTPOUT)
 CLOBBERFILES +=	$(LIBS) $(LIBRARY)
+
+lint: lintcheck
diff --git a/usr/src/cmd/sgs/lex/Makefile.targ b/usr/src/cmd/sgs/lex/Makefile.targ
index ea1bee3a62..fcf853208f 100644
--- a/usr/src/cmd/sgs/lex/Makefile.targ
+++ b/usr/src/cmd/sgs/lex/Makefile.targ
@@ -19,10 +19,10 @@
 # CDDL HEADER END
 #
 #
+# Copyright 2015 Gary Mills
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 $(PROG): objs .WAIT $(POBJS)
@@ -89,17 +89,9 @@ $(DYNLINKLIBDIR)/%: %$(VERS)
 clean:
 	$(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES)
 
-lint: $(LINTPOUT) $(LINTLIB)
+$(LINTLIB): $$(SRCS) 
+	$(LINT.c) -o $(LIBNAME) $(SRCS) > $(LINTOUT) 2>&1 
 
-LINT_HDR=	perl ../../tools/lint_hdr.pl
+lintcheck: $$(SRCS)
+	$(LINT.c) $(LINTCHECKFLAGS) $(SRCS) $(LDLIBS)
 
-$(LINTPOUT): $(SRCS)
-	$(LINT_HDR) $(PROG)			 > $(LINTPOUT)
-	$(LINT_HDR) -s lex			>> $(LINTPOUT)
-	$(LINT.c) $(MACHSRCS) $(LDLIBS)		2>&1 | tee -a $(LINTPOUT)
-
-	$(LINT_HDR) -s libl.so.1		>> $(LINTPOUT)
-	$(LINT.c) $(LIBSRCS)  $(LDLIBS)		2>&1 | tee -a $(LINTPOUT)
-
-$(LINTLIB): $(LINTSRCS)
-	$(LINT.c) -o $(LIBNAME) $(LINTSRCS)
diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com
index 394860af7a..95e4009445 100644
--- a/usr/src/cmd/sgs/libelf/Makefile.com
+++ b/usr/src/cmd/sgs/libelf/Makefile.com
@@ -19,12 +19,12 @@
 # CDDL HEADER END
 #
 #
+# Copyright 2015 Gary Mills
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY=	libelf.a
 VERS=		.1
-M4=		m4
 
 MACHOBJS=
 COMOBJS=	ar.o		begin.o		cntl.o		cook.o \
@@ -50,6 +50,8 @@ OBJECTS=	$(BLTOBJS)  $(MACHOBJS)  $(COMOBJS)  $(CLASSOBJS) $(MISCOBJS)
 
 include $(SRC)/lib/Makefile.lib
 
+# Use the value of M4 set in Makefile.master via Makefile.lib
+
 DEMOFILES=	Makefile	00README	acom.c		dcom.c \
 		pcom.c		tpcom.c		dispsyms.c
 DEMOFILESRCDIR=	../demo
diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com
index 4b9a945978..9744f284ea 100644
--- a/usr/src/cmd/sgs/yacc/Makefile.com
+++ b/usr/src/cmd/sgs/yacc/Makefile.com
@@ -19,6 +19,7 @@
 # CDDL HEADER END
 #
 #
+# Copyright 2015 Gary Mills
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -48,18 +49,23 @@ SRCS=		$(COMSRCS) $(LIBSRCS)
 
 LIBS =          $(DYNLIB) $(LINTLIB)
 
+# Append to LINTFLAGS and LINTFLAGS64 from lib/Makefile.lib
+LINTFLAGS +=	-erroff=E_NAME_MULTIPLY_DEF2
+LINTFLAGS64 +=	-erroff=E_NAME_MULTIPLY_DEF2
+
 # Tune ZDEFS to ignore undefined symbols for building the yacc shared library
 # since these symbols (mainly yyparse) are to be resolved elsewhere.
 #
 $(DYNLIB):= ZDEFS = $(ZNODEFS)
 $(DYNLIBCCC):= ZDEFS = $(ZNODEFS)
 LINTSRCS=	../common/llib-l$(LIBNAME)
+$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 INCLIST=	-I../../include -I../../include/$(MACH)
 CPPFLAGS=	$(INCLIST) $(DEFLIST) $(CPPFLAGS.master)
-LDLIBS=		$(LDLIBS.cmd)
+$(PROG):=	LDLIBS = $(LDLIBS.cmd)
 BUILD.AR=	$(AR) $(ARFLAGS) $@ `$(LORDER) $(OBJS) | $(TSORT)`
-LINTFLAGS=	-amux
+
 LINTPOUT=	lint.out
 
 C99MODE= $(C99_ENABLE)
@@ -68,7 +74,6 @@ CFLAGS64 += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
-$(LINTLIB):=	LINTFLAGS = -nvx
 $(ROOTPROG):= FILEMODE = 0555
 
 ROOTYACCPAR=	$(YACCPAR:%=$(ROOTSHLIBCCS)/%)
@@ -79,7 +84,9 @@ ROOTLINT=	$(LINTSRCS:../common/%=$(ROOTLINTDIR)/%)
 DYNLINKLIBDIR=	$(ROOTLIBDIR)
 DYNLINKLIB=	$(LIBLINKS:%=$(DYNLINKLIBDIR)/%)
 
-$(DYNLIB) :=	LDLIBS += -lc
+LDLIBS += -lc
 
 CLEANFILES +=	$(LINTPOUT)
 CLOBBERFILES +=	$(LIBS) $(LIBRARY)
+
+lint: lintcheck
diff --git a/usr/src/cmd/sgs/yacc/Makefile.targ b/usr/src/cmd/sgs/yacc/Makefile.targ
index 87f8c5221e..9cbf1c440f 100644
--- a/usr/src/cmd/sgs/yacc/Makefile.targ
+++ b/usr/src/cmd/sgs/yacc/Makefile.targ
@@ -19,10 +19,10 @@
 # CDDL HEADER END
 #
 #
+# Copyright 2015 Gary Mills
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 $(PROG): objs .WAIT $(POBJS)
@@ -85,19 +85,9 @@ $(DYNLINKLIBDIR)/%: %$(VERS)
 clean:
 		$(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES)
 
-lint:		$(LINTPOUT) $(LINTLIB)
+$(LINTLIB): $$(SRCS) 
+	$(LINT.c) -o $(LIBNAME) $(SRCS) > $(LINTOUT) 2>&1 
 
+lintcheck: $$(SRCS)
+	$(LINT.c) $(LINTCHECKFLAGS) $(SRCS) $(LDLIBS)
 
-LINT_HDR=	perl ../../tools/lint_hdr.pl
-
-$(LINTPOUT):	$(SRCS)
-	$(LINT_HDR) $(PROG)			 > $(LINTPOUT)
-	$(LINT_HDR) -s yacc			>> $(LINTPOUT)
-	$(LINT.c) $(COMSRCS) $(LDLIBS)		2>&1 | tee -a $(LINTPOUT)
-
-	$(LINT_HDR) -s liby.so.1		>> $(LINTPOUT)
-	$(LINT.c) $(LIBSRCS) $(LDLIBS)		2>&1 | tee -a $(LINTPOUT)
-
-
-$(LINTLIB):	$(LINTSRCS)
-		$(LINT.c) -o $(LIBNAME) $(LINTSRCS)
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index 144d9cfa3d..704d7ba772 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -25,6 +25,7 @@
 # Copyright (c) 2012, Joyent, Inc. All rights reserved.
 # Copyright (c) 2013 Gary Mills
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
+# Copyright (c) 2015 Gary Mills
 
 include ../Makefile.master
 
@@ -561,7 +562,9 @@ _dc:			$(DCSUBDIRS:%=%-nodepend)
 # Library interdependencies are called out explicitly here
 #
 auditd_plugins: libbsm libnsl libsecdb
+krb5:		gss_mechs/mech_krb5
 gss_mechs/mech_krb5:	libgss libnsl libsocket libresolv pkcs11
+gss_mechs/mech_spnego:	gss_mechs/mech_krb5
 libadt_jni:	libbsm
 libast: 	libsocket libm
 libadutils: 	libldap5 libresolv libsocket libnsl
@@ -569,21 +572,24 @@ nsswitch:	libadutils libidmap
 libbe: 		libzfs
 libbsm:		libtsol
 libcmd: 	libsum libast libsocket libnsl
-libcmdutils:	libavl
+libcmdutils:	libavl libnvpair
 libcontract:	libnvpair
+libcpc:		libdevinfo
 libdevid:	libdevinfo
 libdevinfo:	libnvpair libsec
 libdhcpagent:	libsocket libdhcputil libuuid libdlpi libcontract
 libdhcputil:	libnsl libgen libinetutil libdlpi
 libdladm:	libdevinfo libinetutil libsocket libscf librcm libnvpair \
 		libexacct libnsl libkstat libcurses
+libdevice:	libnvpair
 libdll: 	libast
 libdlpi:	libinetutil libdladm
 libds:		libsysevent
 libdscfg:	libnsctl libunistat libsocket libnsl
-libdtrace:	libproc libgen libctf
+libdtrace:	libproc libgen libctf libmapmalloc
 libdtrace_jni:	libuutil libdtrace
 libefi:		libuuid
+libfcoe:	libdladm
 libfstyp:	libnvpair
 libelfsign:	libcryptoutil libkmf
 libidmap:	libadutils libldap5 libavl libsldap libuutil
@@ -596,24 +602,26 @@ libm1:		libc libm
 libmvec:	libc libm
 libnsl:		libmd5
 libmapid:	libresolv
+libnisdb:	libnsl libldap5
+librcm:		libnvpair
 librdc:		libsocket libnsl libnsctl libunistat libdscfg
 libuuid:	libdlpi
 libinetutil:	libsocket
 libipsecutil:	libtecla libsocket
 libinstzones:	libzonecfg libcontract
 libpkg:		libwanboot libscf libadm
-libnwam:	libscf
+libnwam:	libscf libbsm libdladm
 libsecdb:	libnsl
 libsasl:	libgss libsocket pkcs11 libmd
 sasl_plugins:	pkcs11 libgss libsocket libsasl
 libsctp:	libsocket
 libshell:	libast libcmd libdll libsocket libsecdb libm
 libsip:		libmd5
-libsmbfs:	libcmdutils libsocket libnsl libkrb5
+libsmbfs:	libcmdutils libsocket libnsl libkrb5 libsec libidmap
 libsocket:	libnsl
 libstmfproxy: 	libstmf libsocket libnsl libpthread
 libsum: 	libast
-libsysevent:	libsecdb
+libsysevent:	libsecdb libnvpair
 libldap5:	libsasl libsocket libnsl libmd
 libsldap:	libldap5 libtsol libnsl libc libscf libresolv
 libpool:	libnvpair libexacct
@@ -628,14 +636,16 @@ libwrap:	libnsl libsocket
 libwanboot:	libnvpair libresolv libnsl libsocket libdevinfo libinetutil \
 		libdhcputil
 libwanbootutil:	libnsl
-pam_modules:	libproject passwdutil smbsrv
-libscf:		libuutil libmd libgen libsmbios libnsl
+pam_modules:	libproject passwdutil smbsrv libtsnet
+libscf:		libuutil libmd libgen libsmbios libnsl libnvpair
 libinetsvc:	libscf
-librestart:	libuutil libscf
+librestart:	libuutil libscf libpool libproject libsecdb libnvpair
 libsaveargs:	libdisasm
 ../cmd/sgs/libdl:	../cmd/sgs/libconv
 ../cmd/sgs/libelf:	../cmd/sgs/libconv
-pkcs11:		libcryptoutil
+passwdutil:	libsldap
+pkcs11:		libcryptoutil libmd
+#		Adding libuuid or libdladm results in a circular dependancy
 print:		libldap5
 udapl/udapl_tavor:	udapl/libdat
 libzfs:		libdevid libgen libnvpair libuutil \
diff --git a/usr/src/lib/libcurses/screen/keyname.sh b/usr/src/lib/libcurses/screen/keyname.sh
index 906bbd3a81..f4df077e39 100644
--- a/usr/src/lib/libcurses/screen/keyname.sh
+++ b/usr/src/lib/libcurses/screen/keyname.sh
@@ -20,6 +20,7 @@
 # CDDL HEADER END
 #
 # 
+# Copyright 2015 Gary Mills
 # Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # 
@@ -39,11 +40,9 @@
 # contributors.
 #
  
-#ident	"%Z%%M%	%I%	%E% SMI"
-
 rm -f keyname.c
-/usr/bin/echo "#include	\"curses_inc.h\"\n" > keyname.c
-/usr/bin/echo "static	char	*keystrings[] =\n\t\t{" >> keyname.c
+/usr/bin/print "#include	\"curses_inc.h\"\n" > keyname.c
+/usr/bin/print "static	char	*keystrings[] =\n\t\t{" >> keyname.c
 {
     grep -v 'KEY_F(' keycaps | awk '{ print $5, $4 }' | sed -e 's/,//g' -e 's/KEY_//'
     # These three aren't in keycaps
diff --git a/usr/src/lib/libcurses/screen/maketerm.ed b/usr/src/lib/libcurses/screen/maketerm.ed
index 0b2fbb5bc6..4ab79b825d 100644
--- a/usr/src/lib/libcurses/screen/maketerm.ed
+++ b/usr/src/lib/libcurses/screen/maketerm.ed
@@ -308,22 +308,22 @@ e ./tmp/term.h.new
 1;/^#define	auto_left_margin/,/^#define	xon_xoff/s/CURB.*/CUR _b/
 1;/^#define	auto_left_margin/,/^#define	xon_xoff/w ./tmp/tmp.term.h
 1;/^#define	auto_left_margin/,/^#define	xon_xoff/d
-!/usr/bin/echo '{printf "\%s\%d\\n", $0,++i}' > ./tmp/tmp.awk
+!/usr/bin/print '{printf "\%s\%d\\n", $0,++i}' > ./tmp/tmp.awk
 .-1r !awk -f ./tmp/tmp.awk < ./tmp/tmp.term.h
 1;/^#define	columns/,/^#define	width_status_line/s/CURN.*/CUR _c/
 1;/^#define	columns/,/^#define	width_status_line/w ./tmp/tmp.term.h
 1;/^#define	columns/,/^#define	width_status_line/d
-!/usr/bin/echo '{printf "\%s\%d\\n", $0,++i}' > ./tmp/tmp.awk
+!/usr/bin/print '{printf "\%s\%d\\n", $0,++i}' > ./tmp/tmp.awk
 .-1r !awk -f ./tmp/tmp.awk < ./tmp/tmp.term.h
 1;/^#define	back_tab/,/^#define	lab_f8/s/CURS.*/CUR _Vr2_Astrs._s/
 1;/^#define	back_tab/,/^#define	lab_f8/w ./tmp/tmp.term.h
 1;/^#define	back_tab/,/^#define	lab_f8/d
-!/usr/bin/echo '{printf "\%s\%d\\n", $0,++i}' > ./tmp/tmp.awk
+!/usr/bin/print '{printf "\%s\%d\\n", $0,++i}' > ./tmp/tmp.awk
 .-1r !awk -f ./tmp/tmp.awk < ./tmp/tmp.term.h
 1;/^#define	lab_f9/,/^#define	prtr_non/s/CURS.*/CUR _Vr2_Bstrs._s/
 1;/^#define	lab_f9/,/^#define	prtr_non/w ./tmp/tmp.term.h
 1;/^#define	lab_f9/,/^#define	prtr_non/d
-!/usr/bin/echo 'BEGIN{i=100}\n{printf "\%s\%d\\n", $0,++i}' > ./tmp/tmp.awk
+!/usr/bin/print 'BEGIN{i=100}\n{printf "\%s\%d\\n", $0,++i}' > ./tmp/tmp.awk
 .-1r !awk -f ./tmp/tmp.awk < ./tmp/tmp.term.h
 !rm -f ./tmp/tmp.term.h ./tmp/tmp.awk
 w ./tmp/term.h.new