Update to 4.1:

This document details the changes between this version, bash-4.1-rc,
and the previous version, bash-4.1-beta.

1.  Changes to Bash

a.  Fixed a bug that caused printf to not return a partial value when it
    encountered an error while converting an integer argument.

b.  Fixed a bug that caused setting one of the compatNN options to not
    turn off the others.

c.  The (undocumented) --wordexp option is no longer included by default.

d.  Fixed a bug in conditional command execution that caused it to not
    correctly ignore the exit status under certain circumstances.

e.  Added a configure-time check for correctly-working asprintf/snprintf.

f.  Fixed some problems with line number calculation and display when sourcing
    a file in an interactive shell.

g.  Fixed a bug that caused the shell to crash when using `declare -A foo=bar'.

h.  Fixed a bug that caused an off-by-one error when calculating the directories
    to display with the PROMPT_DIRTRIM option.

2.  Changes to Readline

a.  Fixed a bug that caused applications using the callback interface to not
    react to SIGINT (or other signals) until another character arrived.

------------------------------------------------------------------------------
This document details the changes between this version, bash-4.1-beta,
and the previous version, bash-4.1-alpha.

1.  Changes to Bash

a.  Fixed a bug in mapfile that caused the shell to crash if it was passed the
    name of an associative array.

b.  Fixed a bug that caused the shell to incorrectly split case patterns if
    they contained characters in $IFS.

c.  Fixed a bug that caused the shell to set $? to the wrong value when using
    a construct ending with a variable assignment with set -x enabled and PS4
    containing a command substitution.

d.  Fixed a bug that caused the shell to read commands incorrectly if an
    expansion error occurred under certain conditions in a user-specified
    subshell.

e.  Fixed a bug that caused the shell to set $? incorrectly if a parse error
    occurred in an evaluation context ("eval", trap command, dot script, etc.)

f.  Fixed a bug that caused the shell to attempt command substitution
    completion within a single-quoted string.

g.  Fixed a bug that caused the shell to insert an extra single quote during
    word completion.

h.  Fixed a bug that caused the shell to crash if invoked with the environment
    variable EMACS having a null value.

i.  Fixed a bug that caused bash to incorrectly report the presence of new
    mail in a `maildir' environment.

j.  Fixed a bug that caused the shell to not recognize a here-document ending
    delimiter inside a command substitution.

k.  Fixed a bug that caused the shell to crash when a a dynamic array variable
    was assigned a scalar value.

2.  Changes to Readline

3.  New Features in Bash

a.  The mapfile/readarray builtin no longer stores the commands it invokes via
    callbacks in the history list.

b.  There is a new `compat40' shopt option.

c.  The < and > operators to [[ do string comparisons using the current locale
    only if the compatibility level is greater than 40 (set to 41 by default).

4.  New Features in Readline

------------------------------------------------------------------------------
This document details the changes between this version, bash-4.1-alpha,
and the previous version, bash-4.0-release.

1.  Changes to Bash

a.  Fixed bugs in the parser involving new parsing of the commands contained
    in command substitution when the substitution is read.

b.  Fixed a bug that caused the shell to dump core when performing programmable
    completion using a shell function.

c.  Fixed a bug in `mapfile' that caused it to invoke callbacks at the wrong
    time.

d.  Fixed a bug that caused the shell to dump core when listing jobs in the
    `exit' builtin.

e.  Fixed several bugs encountered when reading subscripts in associative
    array assignments and expansions.

f.  Fixed a bug that under some circumstances caused an associative array to
    be converted to an indexed array.

g.  Fixed a bug that caused syntax errors and SIGINT interrupts to not set
    $? to a value > 128.

h.  Fixed a bug that caused the shell to remove FIFOs associated with process
    substitution inside shell functions.

i.  Fixed a bug that caused terminal attributes to not be reset when the
    `read' builtin timed out.

j.  Fixed a bug in brace expansion that caused unwanted zero padding of the
    expanded terms.

k.  Fixed a bug that prevented the |& construct from working as intended when
    used with a simple command with additional redirections.

l.  Fixed a bug with the case statment ;& terminator that caused the shell to
    dereference a NULL pointer.

m.  Fixed a bug that caused assignment statements or redirections preceding
    a simple command name to inhibit alias expansion.

n.  Fixed the behavior of `set -u' to conform to the latest Posix interpretation:
    every expansion of an unset variable except $@ and $* will cause the
    shell to exit.

o.  Fixed a bug that caused double-quoted expansions of $* inside word
    expansions like ${x#$*} to not expand properly when $IFS is empty.

p.  Fixed a bug that caused traps to set $LINENO to the wrong value when they
    execute.

q.  Fixed a bug that caused off-by-one errors when computing history lines in
    the `fc' builtin.

r.  Fixed a bug that caused some terminating signals to not exit the shell
    quickly enough, forcing the kernel to send the signal (e.g., SIGSEGV)
    multiple times.

s.  Fixed a bug that caused the shell to attempt to add empty lines to the
    history list when reading here documents.

t.  Made some internal changes that dramatically speeds up sequential indexed
    array access.

u.  Fixed a bug that caused the shell to write past the end of a string when
    completing a double-quoted string ending in a backslash.

v.  Fixed a bug that caused the shell to replace too many characters when a
    pattern match was null in a ${foo//bar} expansion.

w.  Fixed bugs in the expansion of ** that caused duplicate directory names
    and the contents of the current directory to be omitted.

x.  Fixed a bug that caused $? to not be set correctly when referencing an
    unset variable with set -u and set -e enabled.

y.  Fixed a bug caused by executing an external program from the DEBUG trap
    while a pipeline was running.  The effect was to disturb the pipeline
    state, occasionally causing it to hang.

z.  Fixed a bug that caused the ** glob expansion to dump core if it
    encountered an unsearchable directory.

aa. Fixed a bug that caused `command -v' and `command -V' to not honor the
    path set by the -p option.

bb. Fixed a bug that caused brace expansion to take place too soon in some
    compound array assignments.

cc. Fixed a bug that caused programmable completion functions' changes to
    READLINE_POINT to not be reflected back to readline.

dd. Fixed a bug that caused the shell to dump core if a trap was executed
    during a shell assignment statement.

ee. Fixed an off-by-one error when computing the number of positional
    parameters for the ${@:0:n} expansion.

ff. Fixed a problem with setting COMP_CWORD for programmable completion
    functions that could leave it set to -1.

gg. Fixed a bug that caused the ERR trap to be triggered in some cases where
    `set -e' would not have caused the shell to exit.

hh. Fixed a bug that caused changes made by `compopt' to not persist past the
    completion function in which compopt was executed.

ii. Fixed a bug that caused the list of hostname completions to not be cleared
    when HOSTNAME was unset.

jj. Fixed a bug that caused variable expansion in here documents to look in
    any temporary environment.

kk. Bash and readline can now convert file names between precomposed and
    decomposed Unicode on Mac OS X ("keyboard" and file system forms,
    respectively).  This affects filename completion (using new
    rl_filename_rewrite_hook), globbing, and readline redisplay.

ll. The ERR and EXIT traps now see a non-zero value for $? when a parser
    error after set -e has been enabled causes the shell to exit.

mm. Fixed a bug that in brace expansion that caused zero-prefixed terms to
    not contain the correct number of digits.

nn. Fixed a bug that caused the shell to free non-allocated memory when
    unsetting an associative array which had had a value implicitly assigned
    to index "0".

oo. Fixed a memory leak in the ${!prefix@} expansion.

pp. Fixed a bug that caused printf to not correctly report all write errors.

qq. Fixed a bug that caused single and double quotes to act as delimiters
    when splitting a command line into words for programmable completion.

rr. Fixed a bug that caused ** globbing that caused **/path/* to match every
    directory, not just those matching `path'.

ss. Fixed a bug that caused the shell to dump core when running `help' without
    arguments if the terminal width was fewer than 7 characters.

2.  Changes to Readline

a.  The SIGWINCH signal handler now avoids calling the redisplay code if
    one arrives while in the middle of redisplay.

b.  Changes to the timeout code to make sure that timeout values greater
    than one second are handled better.

c.  Fixed a bug in the redisplay code that was triggered by a prompt
    containing invisible characters exactly the width of the screen.

d.  Fixed a bug in the redisplay code encountered when running in horizontal
    scroll mode.

e.  Fixed a bug that prevented menu completion from properly completing
    filenames.

f.  Fixed a redisplay bug caused by a multibyte character causing a line to
    wrap.

g.  Fixed a bug that caused key sequences of two characters to not be
    recognized when a longer sequence identical in the first two characters
    was bound.

h.  Fixed a bug that caused history expansion to be attempted on $'...'
    single-quoted strings.

i.  Fixed a bug that caused incorrect redisplay when the prompt contained
    multibyte characters in an `invisible' sequence bracketed by \[ and
    \].

j.  Fixed a bug that caused history expansion to short-circuit after
    encountering a multibyte character.

3.  New Features in Bash

a.  Here-documents within $(...) command substitutions may once more be
    delimited by the closing right paren, instead of requiring a newline.

b.  Bash's file status checks (executable, readable, etc.) now take file
    system ACLs into account on file systems that support them.

c.  Bash now passes environment variables with names that are not valid
    shell variable names through into the environment passed to child
    processes.

d.  The `execute-unix-command' readline function now attempts to clear and
    reuse the current line rather than move to a new one after the command
    executes.

e.  `printf -v' can now assign values to array indices.

f.  New `complete -E' and `compopt -E' options that work on the "empty"
    completion: completion attempted on an empty command line.

g.  New complete/compgen/compopt -D option to define a `default' completion:
    a completion to be invoked on command for which no completion has been
    defined.  If this function returns 124, programmable completion is
    attempted again, allowing a user to dynamically build a set of completions
    as completion is attempted by having the default completion function
    install individual completion functions each time it is invoked.

h.  When displaying associative arrays, subscripts are now quoted.

i.  Changes to dabbrev-expand to make it more `emacs-like': no space appended
    after matches, completions are not sorted, and most recent history entries
    are presented first.

j.  The [[ and (( commands are now subject to the setting of `set -e' and the
    ERR trap.

k.  The source/. builtin now removes NUL bytes from the file before attempting
    to parse commands.

l.  There is a new configuration option (in config-top.h) that forces bash to
    forward all history entries to syslog.

m.  A new variable $BASHOPTS to export shell options settable using `shopt' to
    child processes.

n.  There is a new confgure option that forces the extglob option to be
    enabled by default.

o.  New variable $BASH_XTRACEFD; when set to an integer bash will write xtrace
    output to that file descriptor.

p.  If the optional left-hand-side of a redirection is of the form {var}, the
    shell assigns the file descriptor used to $var or uses $var as the file
    descriptor to move or close, depending on the redirection operator.

q.  The < and > operators to the [[ conditional command now do string
    comparison according to the current locale.

r.  Programmable completion now uses the completion for `b' instead of `a'
    when completion is attempted on a line like: a $(b c.

s.  Force extglob on temporarily when parsing the pattern argument to
    the == and != operators to the [[ command, for compatibility.

t.  Changed the behavior of interrupting the wait builtin when a SIGCHLD is
    received and a trap on SIGCHLD is set to be Posix-mode only.

u.  The read builtin has a new `-N nchars' option, which reads exactly NCHARS
    characters, ignoring delimiters like newline.

4.  New Features in Readline

a.  New bindable function: menu-complete-backward.

b.  In the vi insertion keymap, C-n is now bound to menu-complete by default,
    and C-p to menu-complete-backward.

c.  When in vi command mode, repeatedly hitting ESC now does nothing, even
    when ESC introduces a bound key sequence.  This is closer to how
    historical vi behaves.

d.  New bindable function: skip-csi-sequence.  Can be used as a default to
    consume key sequences generated by keys like Home and End without having
    to bind all keys.

e.  New application-settable function: rl_filename_rewrite_hook.  Can be used
    to rewite or modify filenames read from the file system before they are
    compared to the word to be completed.

f.  New bindable variable: skip-completed-text, active when completing in the
    middle of a word.  If enabled, it means that characters in the completion
    that match characters in the remainder of the word are "skipped" rather
    than inserted into the line.

g.  The pre-readline-6.0 version of menu completion is available as
    "old-menu-complete" for users who do not like the readline-6.0 version.

h.  New bindable variable: echo-control-characters.  If enabled, and the
    tty ECHOCTL bit is set, controls the echoing of characters corresponding
    to keyboard-generated signals.

i.  New bindable variable: enable-meta-key.  Controls whether or not readline
    sends the smm/rmm sequences if the terminal indicates it has a meta key
    that enables eight-bit characters.

4 files changed, 12 insertions, 120 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index f48f42a85fe..31f7b602f34 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,21 +1,15 @@
-# $NetBSD: Makefile,v 1.48 2009/09/04 15:35:10 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/01/16 17:17:04 wiz Exp $
 
-BASH_VERSION=		4.0
-BASH_PATCHLEVEL=	28
+BASH_VERSION=		4.1
 
 DISTNAME=	bash-${BASH_VERSION}
-PKGNAME=	bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
+#PKGNAME=	bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/bash/
 
-PATCH_SITES=	${MASTER_SITES:=bash-4.0-patches/}
-PATCHFILES+=	bash40-001 bash40-002 bash40-003 bash40-004 bash40-005
-PATCHFILES+=	bash40-006 bash40-007 bash40-008 bash40-009 bash40-010
-PATCHFILES+=	bash40-011 bash40-012 bash40-013 bash40-014 bash40-015
-PATCHFILES+=	bash40-016 bash40-017 bash40-018 bash40-019 bash40-020
-PATCHFILES+=	bash40-021 bash40-022 bash40-023 bash40-024 bash40-025
-PATCHFILES+=	bash40-026 bash40-027 bash40-028
+#PATCH_SITES=	${MASTER_SITES:=bash-4.0-patches/}
+#PATCHFILES+=	bash40-001 bash40-002 bash40-003 bash40-004 bash40-005
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
diff --git a/shells/bash/PLIST b/shells/bash/PLIST
index 0f417fc2aec..50639bcdc59 100644
--- a/shells/bash/PLIST
+++ b/shells/bash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/02/24 12:04:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/01/16 17:17:04 wiz Exp $
 bin/bash
 bin/bashbug
 info/bash.info
@@ -14,7 +14,9 @@ share/locale/en@quot/LC_MESSAGES/bash.mo
 share/locale/eo/LC_MESSAGES/bash.mo
 share/locale/es/LC_MESSAGES/bash.mo
 share/locale/et/LC_MESSAGES/bash.mo
+share/locale/fi/LC_MESSAGES/bash.mo
 share/locale/fr/LC_MESSAGES/bash.mo
+share/locale/ga/LC_MESSAGES/bash.mo
 share/locale/hu/LC_MESSAGES/bash.mo
 share/locale/id/LC_MESSAGES/bash.mo
 share/locale/ja/LC_MESSAGES/bash.mo
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index f1b0a292ccd..421795a4c6d 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,92 +1,7 @@
-$NetBSD: distinfo,v 1.18 2009/09/04 15:36:16 wiz Exp $
+$NetBSD: distinfo,v 1.19 2010/01/16 17:17:04 wiz Exp $
 
-SHA1 (bash-4.0.tar.gz) = 2bbed30879f9f424c091a846a48111c27d0b2370
-RMD160 (bash-4.0.tar.gz) = 82aba4b2cb475c2030904a9d22af6208dfa85eb3
-Size (bash-4.0.tar.gz) = 6230779 bytes
-SHA1 (bash40-001) = dc47d547bec938afcd7b382816fec84077f3412f
-RMD160 (bash40-001) = b8f1c1000b5cd12ecee79e29a73f3d576d0ad368
-Size (bash40-001) = 5156 bytes
-SHA1 (bash40-002) = 21dc945126547df03e37a3b68cc4b80b788b9da6
-RMD160 (bash40-002) = bd361806bcfe324570638ebb1a127f197d5e3756
-Size (bash40-002) = 1220 bytes
-SHA1 (bash40-003) = e4c120bdfd0c5bf16889e737e2c69268252812d6
-RMD160 (bash40-003) = bad695faa509341afa97f371dcbdbfee5844ed9b
-Size (bash40-003) = 1749 bytes
-SHA1 (bash40-004) = 5e885301acfe3f57add62b1d4a5ac801ab044c06
-RMD160 (bash40-004) = 35df532a05c159e68285ff618667860b4c0cdf61
-Size (bash40-004) = 1347 bytes
-SHA1 (bash40-005) = fb109c36fad5ef1ce719ee7f0c8df33d70dd822e
-RMD160 (bash40-005) = 1bcf3b9b32400f55470df55e410d717bfa16968c
-Size (bash40-005) = 2021 bytes
-SHA1 (bash40-006) = 7877182638032bbdd6281d1c5bcdb8e8c9648873
-RMD160 (bash40-006) = 441d9352ad02965bc6facc9cfe4e4db13e01af27
-Size (bash40-006) = 1133 bytes
-SHA1 (bash40-007) = 477d2ad9665b09f97de1ec304055c553c531c16e
-RMD160 (bash40-007) = 5a1bd8f24e3a33155ac9194d9c9efe2c12849713
-Size (bash40-007) = 6920 bytes
-SHA1 (bash40-008) = e7f336204810905118a1689329b38df3abdc9522
-RMD160 (bash40-008) = 4dea0c385ec38af6613d07032aa504afb0d9eec8
-Size (bash40-008) = 1196 bytes
-SHA1 (bash40-009) = 8f6f4d6ea5371805897f9435ab0dfe98318bc26b
-RMD160 (bash40-009) = 886a6139a25346bb1703a7dca51a4f905f4f1951
-Size (bash40-009) = 1821 bytes
-SHA1 (bash40-010) = b6ae8581201f10e4a2a87da077880bf65a0a5a9a
-RMD160 (bash40-010) = 0a505d7fa2a2f576a46b6716d7f172098a303392
-Size (bash40-010) = 2152 bytes
-SHA1 (bash40-011) = ab4daf25d8acf6793d7e60cbaa1fb2731cdd057b
-RMD160 (bash40-011) = e1bb7d468eeef37e0167c0bef476f33dbce43650
-Size (bash40-011) = 1383 bytes
-SHA1 (bash40-012) = c9215c1a8a5f30fe92fabfbbebd98b9c298dbf66
-RMD160 (bash40-012) = d0b5e71481991a80ba6a1d75779890838e49051e
-Size (bash40-012) = 1459 bytes
-SHA1 (bash40-013) = 2662229353256fa133bc96868c125855222e6007
-RMD160 (bash40-013) = 0ab5d07aba9303a2c69da8e76dbb12837984cf65
-Size (bash40-013) = 4629 bytes
-SHA1 (bash40-014) = 8e2ada4c483ad219b479531e54e285576ef5c547
-RMD160 (bash40-014) = 232aa79556b0557af200df67f0c13543b4898f6a
-Size (bash40-014) = 3709 bytes
-SHA1 (bash40-015) = 41ac5d729bdb8756c4ee59e27db1eda2d88ff0d0
-RMD160 (bash40-015) = 76fbe55d6222efd59fe0eb6f9daa7badf101dda6
-Size (bash40-015) = 1914 bytes
-SHA1 (bash40-016) = 2aba9164dda6f52872461276fa1ef175784c5535
-RMD160 (bash40-016) = 1ab774b4b6ab0964c53d9a73581081b29aea1ba9
-Size (bash40-016) = 3032 bytes
-SHA1 (bash40-017) = b283d0079b5dfb66444ae1aa95ae37ff5803692d
-RMD160 (bash40-017) = 692f5b1537351b68c0e9ad0aa597342cd01eb0fd
-Size (bash40-017) = 1496 bytes
-SHA1 (bash40-018) = 653671824b58bf81518b042db261d5cac669ce2e
-RMD160 (bash40-018) = bc7d056dfb661059890abb34e80c5204dbf51000
-Size (bash40-018) = 2614 bytes
-SHA1 (bash40-019) = 846df69cbef5dd37addeebeb168152fe6bcee845
-RMD160 (bash40-019) = 02c119daea6b2e414907e3dc386be907b3044c7d
-Size (bash40-019) = 3309 bytes
-SHA1 (bash40-020) = 8bae306cfc0d176f4ebd3cfbbe8d38f38ac9f787
-RMD160 (bash40-020) = 874a368171e9ce773a2f17a8339ba9e622eb83ce
-Size (bash40-020) = 2666 bytes
-SHA1 (bash40-021) = a1c785042f92b85564deb41d142a94dd045b9dac
-RMD160 (bash40-021) = 057becc706b90a5c55d51baa425ee9546e3fa092
-Size (bash40-021) = 1547 bytes
-SHA1 (bash40-022) = 7060344931a866b07754eb0b9d49039df4132053
-RMD160 (bash40-022) = a9c134b260cd4bde1d2c3352b52dcf5e0f333476
-Size (bash40-022) = 1592 bytes
-SHA1 (bash40-023) = e6ccdbc145f81209c04541cbfcb6ba561e7fe8ea
-RMD160 (bash40-023) = dbf73ebe9b63aceb61068a9f133a6d4a946af795
-Size (bash40-023) = 2148 bytes
-SHA1 (bash40-024) = 3471e683167980dcb297bebe17f34646df560ce6
-RMD160 (bash40-024) = 484c6ef4e0bbe887ecff754db18aa25e62075529
-Size (bash40-024) = 3049 bytes
-SHA1 (bash40-025) = ccd98dbb09f13b240ca95986ec55ae5f43e359b3
-RMD160 (bash40-025) = 3fd64c752c3e9f32472455247de52fd08bee1182
-Size (bash40-025) = 3435 bytes
-SHA1 (bash40-026) = 39a9e0233efd5828f92ec7625643557fe628fe06
-RMD160 (bash40-026) = 5edce83d4910e1fadc004f0b35b1a84d624a2dfc
-Size (bash40-026) = 1433 bytes
-SHA1 (bash40-027) = 50976ef737ce3c01957a058ef5b496e152ebe7ac
-RMD160 (bash40-027) = 99a2ba5a9b13d80039982966f7d18533387f66b1
-Size (bash40-027) = 2010 bytes
-SHA1 (bash40-028) = bb3d83b79ed357c86bf75fc41eaf06e913e84c10
-RMD160 (bash40-028) = bc99e904e251a1f30a94359afc42ca2225fb4f29
-Size (bash40-028) = 5567 bytes
-SHA1 (patch-aa) = 4ad4070c742d01372bd65a4466050f3100037e8f
+SHA1 (bash-4.1.tar.gz) = 3bd1ec9c66f3689f6b3495bdaaf9077b2e5dc150
+RMD160 (bash-4.1.tar.gz) = 554c7ecb4a63da431768caed1f958c06b8fa7207
+Size (bash-4.1.tar.gz) = 6598300 bytes
 SHA1 (patch-af) = 34833c0628a60b5200a9559581c617d878eb62a8
 SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
diff --git a/shells/bash/patches/patch-aa b/shells/bash/patches/patch-aa
deleted file mode 100644
index d9b9c868f54..00000000000
--- a/shells/bash/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/09/04 15:36:16 wiz Exp $
-
---- lib/glob/glob.c.orig	2009-09-04 15:33:42.000000000 +0000
-+++ lib/glob/glob.c
-@@ -1018,14 +1018,6 @@ glob_filename (pathname, flags)
-       if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0')
- 	{
- 	  dflags |= GX_ALLDIRS|GX_ADDCURDIR;
--#if 0
--	  /* If we want all directories (dflags & GX_ALLDIRS) and we're not
--	     being called recursively as something like `echo **/*.o'
--	     ((flags & GX_ALLDIRS) == 0), we want to prevent glob_vector from
--	     adding a null directory name to the front of the temp_results
--	     array.  We turn off ADDCURDIR if not called recursively and
--	     dlen == 0 */
--#endif
- 	  if (directory_len == 0 && (flags & GX_ALLDIRS) == 0)
- 	    dflags &= ~GX_ADDCURDIR;
- 	}