Deleted Added
full compact
readdir.c (1573) readdir.c (23658)
1/*
2 * Copyright (c) 1983, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 18 unchanged lines hidden (view full) ---

27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
1/*
2 * Copyright (c) 1983, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 18 unchanged lines hidden (view full) ---

27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35static char sccsid[] = "@(#)readdir.c 8.1 (Berkeley) 6/4/93";
35static char sccsid[] = "@(#)readdir.c 8.3 (Berkeley) 9/29/94";
36#endif /* LIBC_SCCS and not lint */
37
38#include <sys/param.h>
39#include <dirent.h>
40
41/*
42 * get next entry in a directory.
43 */
44struct dirent *
45readdir(dirp)
46 register DIR *dirp;
47{
48 register struct dirent *dp;
49
50 for (;;) {
36#endif /* LIBC_SCCS and not lint */
37
38#include <sys/param.h>
39#include <dirent.h>
40
41/*
42 * get next entry in a directory.
43 */
44struct dirent *
45readdir(dirp)
46 register DIR *dirp;
47{
48 register struct dirent *dp;
49
50 for (;;) {
51 if (dirp->dd_loc == 0) {
51 if (dirp->dd_loc >= dirp->dd_size) {
52 if (dirp->dd_flags & __DTF_READALL)
53 return (NULL);
54 dirp->dd_loc = 0;
55 }
56 if (dirp->dd_loc == 0 && !(dirp->dd_flags & __DTF_READALL)) {
52 dirp->dd_size = getdirentries(dirp->dd_fd,
53 dirp->dd_buf, dirp->dd_len, &dirp->dd_seek);
54 if (dirp->dd_size <= 0)
57 dirp->dd_size = getdirentries(dirp->dd_fd,
58 dirp->dd_buf, dirp->dd_len, &dirp->dd_seek);
59 if (dirp->dd_size <= 0)
55 return NULL;
60 return (NULL);
56 }
61 }
57 if (dirp->dd_loc >= dirp->dd_size) {
58 dirp->dd_loc = 0;
59 continue;
60 }
61 dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
62 if ((int)dp & 03) /* bogus pointer check */
62 dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
63 if ((int)dp & 03) /* bogus pointer check */
63 return NULL;
64 return (NULL);
64 if (dp->d_reclen <= 0 ||
65 dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
65 if (dp->d_reclen <= 0 ||
66 dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
66 return NULL;
67 return (NULL);
67 dirp->dd_loc += dp->d_reclen;
68 if (dp->d_ino == 0)
69 continue;
68 dirp->dd_loc += dp->d_reclen;
69 if (dp->d_ino == 0)
70 continue;
71 if (dp->d_type == DT_WHT && (dirp->dd_flags & DTF_HIDEW))
72 continue;
70 return (dp);
71 }
72}
73 return (dp);
74 }
75}