lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

fix non-portable echo -n usage

Browse Source 
These scripts use #!/bin/sh explicitly, so make sure they avoid echo -n
as different shells treat it differently.  Use the portable printf func
instead.
This commit is contained in:
Mike Frysinger
2015-08-06 04:14:20 -04:00
parent ef086ef8ba
commit 2c61c19f80
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2015-08-09 Mike Frysinger <vapier@gentoo.org>
* iconvdata/tst-tables.sh: Change echo -n to printf.
* nss/db-Makefile: Likewise.
* posix/tst-getconf.sh: Likewise.
* stdio-common/tst-unbputc.sh: Likewise.
2015-08-09 Mike Frysinger <vapier@gentoo.org> 2015-08-09 Mike Frysinger <vapier@gentoo.org>
* sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_MISC]: Move all * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_MISC]: Move all

2
iconvdata/tst-tables.sh
View File

@ -261,7 +261,7 @@ EOF
while read charset charmap; do while read charset charmap; do
if test "$charset" = GB18030; then echo "This might take a while" 1>&2; fi if test "$charset" = GB18030; then echo "This might take a while" 1>&2; fi
case ${charset} in \#*) continue;; esac case ${charset} in \#*) continue;; esac
echo -n "Testing ${charset}" 1>&2 printf %s "Testing ${charset}" 1>&2
if ./tst-table.sh ${common_objpfx} ${objpfx} "${test_program_prefix}" \ if ./tst-table.sh ${common_objpfx} ${objpfx} "${test_program_prefix}" \
${charset} ${charmap} < /dev/null; then ${charset} ${charmap} < /dev/null; then
echo 1>&2 echo 1>&2

18
nss/db-Makefile
View File

@ -31,7 +31,7 @@ all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES)))
$(VAR_DB)/passwd.db: /etc/passwd $(VAR_DB)/passwd.db: /etc/passwd
@echo -n "$(patsubst %.db,%,$(@F))... " @printf %s "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { FS=":"; OFS=":" } \ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \
/^[ \t]*$$/ { next } \ /^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \ /^[ \t]*#/ { next } \
@ -41,7 +41,7 @@ $(VAR_DB)/passwd.db: /etc/passwd
@echo "done." @echo "done."
$(VAR_DB)/group.db: /etc/group $(VAR_DB)/group.db: /etc/group
@echo -n "$(patsubst %.db,%,$(@F))... " @printf %s "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { FS=":"; OFS=":" } \ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \
/^[ \t]*$$/ { next } \ /^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \ /^[ \t]*#/ { next } \
@ -63,7 +63,7 @@ $(VAR_DB)/group.db: /etc/group
@echo "done." @echo "done."
$(VAR_DB)/ethers.db: /etc/ethers $(VAR_DB)/ethers.db: /etc/ethers
@echo -n "$(patsubst %.db,%,$(@F))... " @printf %s "$(patsubst %.db,%,$(@F))... "
@$(AWK) '/^[ \t]*$$/ { next } \ @$(AWK) '/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \ /^[ \t]*#/ { next } \
/^[^#]/ { printf ".%s ", $$1; print; \ /^[^#]/ { printf ".%s ", $$1; print; \
@ -72,7 +72,7 @@ $(VAR_DB)/ethers.db: /etc/ethers
@echo "done." @echo "done."
$(VAR_DB)/protocols.db: /etc/protocols $(VAR_DB)/protocols.db: /etc/protocols
@echo -n "$(patsubst %.db,%,$(@F))... " @printf %s "$(patsubst %.db,%,$(@F))... "
@$(AWK) '/^[ \t]*$$/ { next } \ @$(AWK) '/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \ /^[ \t]*#/ { next } \
/^[^#]/ { printf ".%s ", $$1; print; \ /^[^#]/ { printf ".%s ", $$1; print; \
@ -83,7 +83,7 @@ $(VAR_DB)/protocols.db: /etc/protocols
@echo "done." @echo "done."
$(VAR_DB)/rpc.db: /etc/rpc $(VAR_DB)/rpc.db: /etc/rpc
@echo -n "$(patsubst %.db,%,$(@F))... " @printf %s "$(patsubst %.db,%,$(@F))... "
@$(AWK) '/^[ \t]*$$/ { next } \ @$(AWK) '/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \ /^[ \t]*#/ { next } \
/^[^#]/ { printf ".%s ", $$1; print; \ /^[^#]/ { printf ".%s ", $$1; print; \
@ -94,7 +94,7 @@ $(VAR_DB)/rpc.db: /etc/rpc
@echo "done." @echo "done."
$(VAR_DB)/services.db: /etc/services $(VAR_DB)/services.db: /etc/services
@echo -n "$(patsubst %.db,%,$(@F))... " @printf %s "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { FS="[ \t/]+" } \ @$(AWK) 'BEGIN { FS="[ \t/]+" } \
/^[ \t]*$$/ { next } \ /^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \ /^[ \t]*#/ { next } \
@ -110,7 +110,7 @@ $(VAR_DB)/services.db: /etc/services
@echo "done." @echo "done."
$(VAR_DB)/shadow.db: /etc/shadow $(VAR_DB)/shadow.db: /etc/shadow
@echo -n "$(patsubst %.db,%,$(@F))... " @printf %s "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { FS=":"; OFS=":" } \ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \
/^[ \t]*$$/ { next } \ /^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \ /^[ \t]*#/ { next } \
@ -130,7 +130,7 @@ $(VAR_DB)/shadow.db: /etc/shadow
fi fi
$(VAR_DB)/gshadow.db: /etc/gshadow $(VAR_DB)/gshadow.db: /etc/gshadow
@echo -n "$(patsubst %.db,%,$(@F))... " @printf %s "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { FS=":"; OFS=":" } \ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \
/^[ \t]*$$/ { next } \ /^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \ /^[ \t]*#/ { next } \
@ -150,7 +150,7 @@ $(VAR_DB)/gshadow.db: /etc/gshadow
fi fi
$(VAR_DB)/netgroup.db: /etc/netgroup $(VAR_DB)/netgroup.db: /etc/netgroup
@echo -n "$(patsubst %.db,%,$(@F))... " @printf %s "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { ini=1 } \ @$(AWK) 'BEGIN { ini=1 } \
/^[ \t]*$$/ { next } \ /^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \ /^[ \t]*#/ { next } \

4
posix/tst-getconf.sh
View File

@ -27,7 +27,7 @@ logfile=$common_objpfx/posix/tst-getconf.out
rm -f $logfile rm -f $logfile
result=0 result=0
while read name; do while read name; do
echo -n "getconf $name: " >> $logfile printf %s "getconf $name: " >> $logfile
${run_getconf} "$name" < /dev/null 2>> $logfile >> $logfile ${run_getconf} "$name" < /dev/null 2>> $logfile >> $logfile
if test $? -ne 0; then if test $? -ne 0; then
echo "*** $name FAILED" >> $logfile echo "*** $name FAILED" >> $logfile
@ -205,7 +205,7 @@ XBS5_LPBIG_OFFBIG_LINTFLAGS
EOF EOF
while read name; do while read name; do
echo -n "getconf $name /: " >> $logfile printf %s "getconf $name /: " >> $logfile
${run_getconf} "$name" / < /dev/null 2>> $logfile >> $logfile ${run_getconf} "$name" / < /dev/null 2>> $logfile >> $logfile
if test $? -ne 0; then if test $? -ne 0; then
echo "*** $name FAILED" >> $logfile echo "*** $name FAILED" >> $logfile

2
stdio-common/tst-unbputc.sh
View File

@ -28,6 +28,6 @@ ${test_program_prefix} \
${common_objpfx}stdio-common/tst-unbputc \ ${common_objpfx}stdio-common/tst-unbputc \
2> ${common_objpfx}stdio-common/tst-unbputc.out || status=1 2> ${common_objpfx}stdio-common/tst-unbputc.out || status=1
(echo -n 12 | cmp ${common_objpfx}stdio-common/tst-unbputc.out -) || status=1 (printf 12 | cmp ${common_objpfx}stdio-common/tst-unbputc.out -) || status=1
exit $status exit $status