[src/trunk]: src/bin/ksh ksh: Remove symbol clash with libc

[kamil <kamil%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dff5edbe38d7
branches:  trunk
changeset: 319587:dff5edbe38d7
user:      kamil <kamil%NetBSD.org@localhost>
date:      Sun Jun 03 16:09:31 2018 +0000

description:
ksh: Remove symbol clash with libc

Rename local function glob() to ksh_glob().
This is needed for installing interceptors in sanitizers.

Sponsored by <The NetBSD Foundation>

diffstat:

 bin/ksh/eval.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r e7ee4f5f96e2 -r dff5edbe38d7 bin/ksh/eval.c
--- a/bin/ksh/eval.c    Sun Jun 03 15:26:03 2018 +0000
+++ b/bin/ksh/eval.c    Sun Jun 03 16:09:31 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eval.c,v 1.23 2018/05/08 16:37:59 kamil Exp $  */
+/*     $NetBSD: eval.c,v 1.24 2018/06/03 16:09:31 kamil Exp $  */
 
 /*
  * Expansion - quoting, separation, substitution, globbing
@@ -6,7 +6,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: eval.c,v 1.23 2018/05/08 16:37:59 kamil Exp $");
+__RCSID("$NetBSD: eval.c,v 1.24 2018/06/03 16:09:31 kamil Exp $");
 #endif
 
 #include <sys/stat.h>
@@ -50,7 +50,7 @@
 static int     varsub ARGS((Expand *xp, char *sp, char *word, int *stypep, int *slenp));
 static int     comsub ARGS((Expand *xp, char *cp));
 static char   *trimsub ARGS((char *str, char *pat, int how));
-static void    glob ARGS((char *cp, XPtrV *wp, int markdirs));
+static void    ksh_glob ARGS((char *cp, XPtrV *wp, int markdirs));
 static void    globit ARGS((XString *xs, char **xpp, char *sp, XPtrV *wp,
                             int check));
 static char    *maybe_expand_tilde ARGS((char *p, XString *dsp, char **dpp,
@@ -578,7 +578,7 @@
                                else
 #endif /* BRACE_EXPAND */
                                if (fdo & DOGLOB)
-                                       glob(p, wp, f & DOMARKDIRS);
+                                       ksh_glob(p, wp, f & DOMARKDIRS);
                                else if ((f & DOPAT) || !(fdo & DOMAGIC_))
                                        XPput(*wp, p);
                                else
@@ -945,13 +945,13 @@
 }
 
 /*
- * glob
+ * ksh_glob
  * Name derived from V6's /etc/glob, the program that expanded filenames.
  */
 
 /* XXX cp not const 'cause slashes are temporarily replaced with nulls... */
 static void
-glob(cp, wp, markdirs)
+ksh_glob(cp, wp, markdirs)
        char *cp;
        XPtrV *wp;
        int markdirs;
@@ -1340,7 +1340,7 @@
                 * expansion. }
                 */
                if (fdo & DOGLOB)
-                       glob(start, wp, fdo & DOMARKDIRS);
+                       ksh_glob(start, wp, fdo & DOMARKDIRS);
                else
                        XPput(*wp, debunk(start, start, end - start));
                return;