5 files changed, 9 insertions, 9 deletions

diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 1537196709c2..56ecae8a9f81 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -341,7 +341,7 @@ umaskcmd(int argc __unused, char **argv __unused)
 		} else {
 			void *set;
 			INTOFF;
-			if ((set = setmode (ap)) == 0)
+			if ((set = setmode (ap)) == NULL)
 				error("Illegal number: %s", ap);
 
 			mask = getmode (set, ~mask & 0777);
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index da6defdb2c79..3f9732cbbff3 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -628,7 +628,7 @@ simplecmd(union node **rpp, union node *redir)
 
 	/* If we don't have any redirections already, then we must reset */
 	/* rpp to be the address of the local redir variable.  */
-	if (redir == 0)
+	if (redir == NULL)
 		rpp = &redir;
 
 	args = NULL;
diff --git a/bin/sh/tests/builtins/getopts1.0 b/bin/sh/tests/builtins/getopts1.0
index 64763bc462c1..10d2b59208e5 100644
--- a/bin/sh/tests/builtins/getopts1.0
+++ b/bin/sh/tests/builtins/getopts1.0
@@ -3,7 +3,7 @@
 printf -- '-1-\n'
 set -- -abc
 getopts "ab:" OPTION
-echo ${OPTION}
+printf '%s\n' "${OPTION}"
 
 # In this case 'getopts' should realize that we have not provided the
 # required argument for "-b".
@@ -14,12 +14,12 @@ echo ${OPTION}
 printf -- '-2-\n'
 set -- -ab
 getopts "ab:" OPTION
-echo ${OPTION}
+printf '%s\n' "${OPTION}"
 getopts "ab:" OPTION 3>&2 2>&1 >&3 3>&-
-echo ${OPTION}
+printf '%s\n' "${OPTION}"
 
 # The 'shift' is aimed at causing an error.
 printf -- '-3-\n'
 shift 1
 getopts "ab:" OPTION
-echo ${OPTION}
+printf '%s\n' "${OPTION}"
diff --git a/bin/sh/tests/builtins/getopts2.0 b/bin/sh/tests/builtins/getopts2.0
index 5a5dbe20cb6a..1bd2c32db81c 100644
--- a/bin/sh/tests/builtins/getopts2.0
+++ b/bin/sh/tests/builtins/getopts2.0
@@ -3,4 +3,4 @@ set - -ax
 getopts ax option
 set -C
 getopts ax option
-echo $option
+printf '%s\n' "$option"
diff --git a/bin/sh/tests/builtins/getopts9.0 b/bin/sh/tests/builtins/getopts9.0
index d23fc432af97..1c35fc68c2d1 100644
--- a/bin/sh/tests/builtins/getopts9.0
+++ b/bin/sh/tests/builtins/getopts9.0
@@ -2,8 +2,8 @@
 
 args='-ab'
 getopts ab opt $args
-echo $?:$opt:$OPTARG
+printf '%s\n' "$?:$opt:$OPTARG"
 for dummy in dummy1 dummy2; do
 	getopts ab opt $args
-	echo $?:$opt:$OPTARG
+	printf '%s\n' "$?:$opt:$OPTARG"
 done