diff options
author | Damien Miller <djm@mindrot.org> | 2002-09-11 10:29:11 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-09-11 10:29:11 +1000 |
commit | 71eb0c1550ec6ad10d29779df7a7f97c44000e3a (patch) | |
tree | 1cbfd081547bcf3bfcc26e17f2f4537a03ced5ff /openbsd-compat/glob.c | |
parent | c34e03e4711cabffae3504bcfdac26b67250c45d (diff) |
- (djm) Sync openbsd-compat with OpenBSD -current
Diffstat (limited to 'openbsd-compat/glob.c')
-rw-r--r-- | openbsd-compat/glob.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 14c91420d..e928a2272 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c | |||
@@ -56,7 +56,7 @@ get_arg_max(void) | |||
56 | #if 0 | 56 | #if 0 |
57 | static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; | 57 | static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; |
58 | #else | 58 | #else |
59 | static char rcsid[] = "$OpenBSD: glob.c,v 1.16 2001/04/05 18:36:12 deraadt Exp $"; | 59 | static char rcsid[] = "$OpenBSD: glob.c,v 1.20 2002/06/14 21:34:58 todd Exp $"; |
60 | #endif | 60 | #endif |
61 | #endif /* LIBC_SCCS and not lint */ | 61 | #endif /* LIBC_SCCS and not lint */ |
62 | 62 | ||
@@ -137,32 +137,32 @@ typedef char Char; | |||
137 | #define ismeta(c) (((c)&M_QUOTE) != 0) | 137 | #define ismeta(c) (((c)&M_QUOTE) != 0) |
138 | 138 | ||
139 | 139 | ||
140 | static int compare __P((const void *, const void *)); | 140 | static int compare(const void *, const void *); |
141 | static int g_Ctoc __P((const Char *, char *, u_int)); | 141 | static int g_Ctoc(const Char *, char *, u_int); |
142 | static int g_lstat __P((Char *, struct stat *, glob_t *)); | 142 | static int g_lstat(Char *, struct stat *, glob_t *); |
143 | static DIR *g_opendir __P((Char *, glob_t *)); | 143 | static DIR *g_opendir(Char *, glob_t *); |
144 | static Char *g_strchr __P((Char *, int)); | 144 | static Char *g_strchr(Char *, int); |
145 | static int g_stat __P((Char *, struct stat *, glob_t *)); | 145 | static int g_stat(Char *, struct stat *, glob_t *); |
146 | static int glob0 __P((const Char *, glob_t *)); | 146 | static int glob0(const Char *, glob_t *); |
147 | static int glob1 __P((Char *, Char *, glob_t *, size_t *)); | 147 | static int glob1(Char *, Char *, glob_t *, size_t *); |
148 | static int glob2 __P((Char *, Char *, Char *, Char *, Char *, Char *, | 148 | static int glob2(Char *, Char *, Char *, Char *, Char *, Char *, |
149 | glob_t *, size_t *)); | 149 | glob_t *, size_t *); |
150 | static int glob3 __P((Char *, Char *, Char *, Char *, Char *, Char *, | 150 | static int glob3(Char *, Char *, Char *, Char *, Char *, Char *, |
151 | Char *, Char *, glob_t *, size_t *)); | 151 | Char *, Char *, glob_t *, size_t *); |
152 | static int globextend __P((const Char *, glob_t *, size_t *)); | 152 | static int globextend(const Char *, glob_t *, size_t *); |
153 | static const Char * | 153 | static const Char * |
154 | globtilde __P((const Char *, Char *, size_t, glob_t *)); | 154 | globtilde(const Char *, Char *, size_t, glob_t *); |
155 | static int globexp1 __P((const Char *, glob_t *)); | 155 | static int globexp1(const Char *, glob_t *); |
156 | static int globexp2 __P((const Char *, const Char *, glob_t *, int *)); | 156 | static int globexp2(const Char *, const Char *, glob_t *, int *); |
157 | static int match __P((Char *, Char *, Char *)); | 157 | static int match(Char *, Char *, Char *); |
158 | #ifdef DEBUG | 158 | #ifdef DEBUG |
159 | static void qprintf __P((const char *, Char *)); | 159 | static void qprintf(const char *, Char *); |
160 | #endif | 160 | #endif |
161 | 161 | ||
162 | int | 162 | int |
163 | glob(pattern, flags, errfunc, pglob) | 163 | glob(pattern, flags, errfunc, pglob) |
164 | const char *pattern; | 164 | const char *pattern; |
165 | int flags, (*errfunc) __P((const char *, int)); | 165 | int flags, (*errfunc)(const char *, int); |
166 | glob_t *pglob; | 166 | glob_t *pglob; |
167 | { | 167 | { |
168 | const u_char *patnext; | 168 | const u_char *patnext; |
@@ -677,7 +677,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, | |||
677 | 677 | ||
678 | 678 | ||
679 | /* | 679 | /* |
680 | * Extend the gl_pathv member of a glob_t structure to accomodate a new item, | 680 | * Extend the gl_pathv member of a glob_t structure to accommodate a new item, |
681 | * add the new item, and update gl_pathc. | 681 | * add the new item, and update gl_pathc. |
682 | * | 682 | * |
683 | * This assumes the BSD realloc, which only copies the block when its size | 683 | * This assumes the BSD realloc, which only copies the block when its size |
@@ -822,7 +822,7 @@ g_opendir(str, pglob) | |||
822 | char buf[MAXPATHLEN]; | 822 | char buf[MAXPATHLEN]; |
823 | 823 | ||
824 | if (!*str) | 824 | if (!*str) |
825 | strcpy(buf, "."); | 825 | strlcpy(buf, ".", sizeof buf); |
826 | else { | 826 | else { |
827 | if (g_Ctoc(str, buf, sizeof(buf))) | 827 | if (g_Ctoc(str, buf, sizeof(buf))) |
828 | return(NULL); | 828 | return(NULL); |