diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /openbsd-compat/glob.c | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'openbsd-compat/glob.c')
-rw-r--r-- | openbsd-compat/glob.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index f6a04ea3f..b3dd2b171 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c | |||
@@ -34,7 +34,21 @@ | |||
34 | /* OPENBSD ORIGINAL: lib/libc/gen/glob.c */ | 34 | /* OPENBSD ORIGINAL: lib/libc/gen/glob.c */ |
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | |||
38 | #include <sys/types.h> | ||
39 | #include <sys/stat.h> | ||
40 | |||
41 | #include <dirent.h> | ||
37 | #include <ctype.h> | 42 | #include <ctype.h> |
43 | #include <errno.h> | ||
44 | #include <pwd.h> | ||
45 | #include <stdlib.h> | ||
46 | #include <string.h> | ||
47 | #include <unistd.h> | ||
48 | |||
49 | #if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \ | ||
50 | !defined(GLOB_HAS_GL_MATCHC) || \ | ||
51 | !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0 | ||
38 | 52 | ||
39 | static long | 53 | static long |
40 | get_arg_max(void) | 54 | get_arg_max(void) |
@@ -48,9 +62,6 @@ get_arg_max(void) | |||
48 | #endif | 62 | #endif |
49 | } | 63 | } |
50 | 64 | ||
51 | #if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \ | ||
52 | !defined(GLOB_HAS_GL_MATCHC) | ||
53 | |||
54 | /* | 65 | /* |
55 | * glob(3) -- a superset of the one defined in POSIX 1003.2. | 66 | * glob(3) -- a superset of the one defined in POSIX 1003.2. |
56 | * | 67 | * |