diff options
| author | Damien Miller <djm@mindrot.org> | 2011-09-22 13:20:21 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-09-22 13:20:21 +0200 |
| commit | e01a6270477bc4037ec8b48c5c19caf6be0818c6 (patch) | |
| tree | 1ff80e7227b1929c120b1d5a5e320260a78b66cf /openbsd-compat/glob.c | |
| parent | - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From (diff) | |
| download | openssh-e01a6270477bc4037ec8b48c5c19caf6be0818c6.tar.xz openssh-e01a6270477bc4037ec8b48c5c19caf6be0818c6.zip | |
- pyr@cvs.openbsd.org 2011/05/12 07:15:10
[openbsd-compat/glob.c]
When the max number of items for a directory has reached GLOB_LIMIT_READDIR
an error is returned but closedir() is not called.
spotted and fix provided by Frank Denis obsd-tech@pureftpd.org
ok otto@, millert@
Diffstat (limited to 'openbsd-compat/glob.c')
| -rw-r--r-- | openbsd-compat/glob.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 0341225cd..ebb7aa805 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.c,v 1.35 2011/01/12 01:53:14 djm Exp $ */ +/* $OpenBSD: glob.c,v 1.36 2011/05/12 07:15:10 pyr Exp $ */ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -697,7 +697,8 @@ glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, errno = 0; *pathend++ = SEP; *pathend = EOS; - return(GLOB_NOSPACE); + err = GLOB_NOSPACE; + break; } /* Initial DOT must be matched literally. */ |