Imported from ../bash-3.1.tar.gz.

[platform/upstream/bash.git] / pathexp.h

diff --git a/pathexp.h b/pathexp.h
index 688938e..5f1731a 100644 (file)
--- a/pathexp.h
+++ b/pathexp.h
@@ -1,6 +1,6 @@
 /* pathexp.h -- The shell interface to the globbing library. */
 
-/* Copyright (C) 1987,1989 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -34,15 +34,18 @@ extern char *glob_error_return;
 #define QGLOB_FILENAME 0x02    /* do correct quoting for matching filenames */
 
 #if defined (EXTENDED_GLOB)
-/* Flags to OR with other flag args to fnmatch() to enabled the extended
+/* Flags to OR with other flag args to strmatch() to enabled the extended
    pattern matching. */
 #  define FNMATCH_EXTFLAG      (extended_glob ? FNM_EXTMATCH : 0)
 #else
 #  define FNMATCH_EXTFLAG      0
 #endif /* !EXTENDED_GLOB */
 
+#define FNMATCH_IGNCASE                (match_ignore_case ? FNM_CASEFOLD : 0)
+
 extern int glob_dot_filenames;
 extern int extended_glob;
+extern int match_ignore_case;  /* doesn't really belong here */
 
 extern int unquoted_glob_pattern_p __P((char *));
 
@@ -63,7 +66,7 @@ extern char *quote_globbing_chars __P((char *));
 /* Call the glob library to do globbing on PATHNAME. */
 extern char **shell_glob_filename __P((const char *));
 
-/* Filename completion ignore.  Used to the "fignore" facility of
+/* Filename completion ignore.  Used to implement the "fignore" facility of
    tcsh and GLOBIGNORE (like ksh-93 FIGNORE).
 
    It is passed a NULL-terminated array of (char *)'s that must be
@@ -77,12 +80,14 @@ struct ign {
   int len, flags;
 };
 
+typedef int sh_iv_item_func_t __P((struct ign *));
+
 struct ignorevar {
   char *varname;       /* FIGNORE or GLOBIGNORE */
   struct ign *ignores; /* Store the ignore strings here */
   int num_ignores;     /* How many are there? */
   char *last_ignoreval;        /* Last value of variable - cached for speed */
-  Function *item_func; /* Called when each item is parsed from $`varname' */
+  sh_iv_item_func_t *item_func; /* Called when each item is parsed from $`varname' */
 };
 
 extern void setup_ignore_patterns __P((struct ignorevar *));