aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2010-09-07 23:38:28 -0700
committerDenys Vlasenko <dvlasenk@redhat.com>2010-09-09 11:48:02 +0200
commit77d48726917e6493a8a077be93bb07b22fd2c209 (patch)
tree71b1d17d7a8a91192d8d0cd3fe0a3dc1028b4a6a /shell
parent95d48f259807c408de731f580bd48cf20dec724a (diff)
downloadbusybox-w32-77d48726917e6493a8a077be93bb07b22fd2c209.tar.gz
busybox-w32-77d48726917e6493a8a077be93bb07b22fd2c209.tar.bz2
busybox-w32-77d48726917e6493a8a077be93bb07b22fd2c209.zip
Avoid side effects in putc(), which may be implemented as a macro
Signed-off-by: Dan Fandrich <dan@coneharvesters.com> Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 70425b324..f262872ea 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -953,7 +953,8 @@ sharg(union node *arg, FILE *fp)
953 for (p = arg->narg.text; *p; p++) { 953 for (p = arg->narg.text; *p; p++) {
954 switch ((unsigned char)*p) { 954 switch ((unsigned char)*p) {
955 case CTLESC: 955 case CTLESC:
956 putc(*++p, fp); 956 p++;
957 putc(*p, fp);
957 break; 958 break;
958 case CTLVAR: 959 case CTLVAR:
959 putc('$', fp); 960 putc('$', fp);
@@ -962,8 +963,10 @@ sharg(union node *arg, FILE *fp)
962 if (subtype == VSLENGTH) 963 if (subtype == VSLENGTH)
963 putc('#', fp); 964 putc('#', fp);
964 965
965 while (*p != '=') 966 while (*p != '=') {
966 putc(*p++, fp); 967 putc(*p, fp);
968 p++;
969 }
967 970
968 if (subtype & VSNUL) 971 if (subtype & VSNUL)
969 putc(':', fp); 972 putc(':', fp);