ethr-wake: can use ether_hostton on uclibc >= 0.9.30

[oweals/busybox.git] / shell / match.c

diff --git a/shell/match.c b/shell/match.c
index 47038d667132622f7bbc4b91cdcbc4fb1a768f73..a7101ef7e2fab24ad3cc93749e986c0a72da4891 100644 (file)
--- a/shell/match.c
+++ b/shell/match.c
@@ -11,8 +11,6 @@
  * Kenneth Almquist.
  *
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
- *
- * Original BSD copyright notice is retained at the end of this file.
  */
 #ifdef STANDALONE
 # include <stdbool.h>
@@ -28,7 +26,7 @@
 
 #define pmatch(a, b) !fnmatch((a), (b), 0)
 
-char *scanleft(char *string, char *pattern, bool zero)
+char *scanleft(char *string, char *pattern, bool match_at_left)
 {
        char c;
        char *loc = string;
@@ -38,7 +36,7 @@ char *scanleft(char *string, char *pattern, bool zero)
                const char *s;
 
                c = *loc;
-               if (zero) {
+               if (match_at_left) {
                        *loc = '\0';
                        s = string;
                } else
@@ -55,7 +53,7 @@ char *scanleft(char *string, char *pattern, bool zero)
        return NULL;
 }
 
-char *scanright(char *string, char *pattern, bool zero)
+char *scanright(char *string, char *pattern, bool match_at_left)
 {
        char c;
        char *loc = string + strlen(string);
@@ -65,7 +63,7 @@ char *scanright(char *string, char *pattern, bool zero)
                const char *s;
 
                c = *loc;
-               if (zero) {
+               if (match_at_left) {
                        *loc = '\0';
                        s = string;
                } else
@@ -88,7 +86,7 @@ int main(int argc, char *argv[])
        char *string;
        char *op;
        char *pattern;
-       bool zero;
+       bool match_at_left;
        char *loc;
 
        int i;
@@ -117,15 +115,15 @@ int main(int argc, char *argv[])
                        continue;
                }
                op = string + off;
-               scan = pick_scan(op[0], op[1], &zero);
+               scan = pick_scan(op[0], op[1], &match_at_left);
                pattern = op + 1;
                if (op[0] == op[1])
                        op[1] = '\0', ++pattern;
                op[0] = '\0';
 
-               loc = scan(string, pattern, zero);
+               loc = scan(string, pattern, match_at_left);
 
-               if (zero) {
+               if (match_at_left) {
                        printf("'%s'\n", loc);
                } else {
                        *loc = '\0';