aboutsummaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-12-12 04:29:09 +0000
committerRoland McGrath <roland@gnu.org>1995-12-12 04:29:09 +0000
commit3be01400fddc34cc895b903c69c5d24d4b38cdf9 (patch)
tree2107ca789a267e719e39784f6a10c363856e9aa2 /posix
parent65bf5fa3172ab9d77fd1792fae68ad85eed2a7b1 (diff)
downloadglibc-3be01400fddc34cc895b903c69c5d24d4b38cdf9.zip
glibc-3be01400fddc34cc895b903c69c5d24d4b38cdf9.tar.gz
glibc-3be01400fddc34cc895b903c69c5d24d4b38cdf9.tar.bz2
Mon Dec 11 20:07:54 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/glob.c [! STDC_HEADERS]: Declare getenv. (glob): Avoid using function as value. * elf/rtld.c (dl_main): When mapping argument executable, set l_name to "", not l_libname. After loading DT_NEEDED library, set its l_type to lt_library. * sysdeps/mach/hurd/mmap.c: Don't interpret MAP_INHERIT to mean VM_INHERIT. We can't handle MAP_INHERIT easily. Handle non-page-aligned addresses if congruent to offset. * elf/dl-init.c: Skip the initializer for l_type lt_executable with l_name "". Start at _dl_loaded; don't skip the first element. * elf/dl-load.c (MAP_FILE): Define to zero if undefined. (MAP_COPY): Define to MAP_PRIVATE if undefined. (_dl_map_object_from_fd): Don't use MAP_INHERIT in mmap calls. If file it ET_EXEC, set its l_type to lt_executable.
Diffstat (limited to 'posix')
-rw-r--r--posix/glob.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/posix/glob.c b/posix/glob.c
index ce17fe1..e212576 100644
--- a/posix/glob.c
+++ b/posix/glob.c
@@ -106,6 +106,8 @@ extern int errno;
#define ANSI_STRING
#else /* No standard headers. */
+extern char *getenv ();
+
#ifdef HAVE_STRING_H
#include <string.h>
#define ANSI_STRING
@@ -496,7 +498,8 @@ glob (pattern, flags, errfunc, pglob)
struct stat st;
for (i = oldcount; i < pglob->gl_pathc; ++i)
if (((flags & GLOB_ALTDIRFUNC) ?
- *pglob->gl_stat : __stat) (pglob->gl_pathv[i], &st) == 0 &&
+ (*pglob->gl_stat) (pglob->gl_pathv[i], &st) :
+ __stat (pglob->gl_pathv[i], &st)) == 0 &&
S_ISDIR (st.st_mode))
{
size_t len = strlen (pglob->gl_pathv[i]) + 2;