[git commit] ash,hush: comment and debug tweaks, no code changes

Denys Vlasenko vda.linux at googlemail.com
Tue Aug 15 13:27:41 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=4476c703015d026dfd8057a28010c33943aa2a9c
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/ash.c  | 5 +++--
 shell/hush.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/shell/ash.c b/shell/ash.c
index 224d776..58999fa 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7704,8 +7704,9 @@ static int
 patmatch(char *pattern, const char *string)
 {
 	char *p = preglob(pattern, 0);
-	//bb_error_msg("fnmatch(pattern:'%s',str:'%s')", p, string);
-	return pmatch(p, string);
+	int r = pmatch(p, string);
+	//bb_error_msg("!fnmatch(pattern:'%s',str:'%s',0):%d", p, string, r);
+	return r;
 }
 
 /*
diff --git a/shell/hush.c b/shell/hush.c
index 517b8c1..42f95ef 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -9948,7 +9948,7 @@ Test that VAR is a valid variable name?
 		c = '?';
 	}
 
-	/* Set OPTIND */
+	/* Set VAR and OPTIND */
 	cbuf[0] = c;
 	set_local_var_from_halves(var, cbuf);
 	set_local_var_from_halves("OPTIND", utoa(optind));


More information about the busybox-cvs mailing list