Deleted Added
sdiff udiff text old ( 270002 ) new ( 282979 )
full compact
telldir.c (270002) telldir.c (282979)
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

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

26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#if defined(LIBC_SCCS) && !defined(lint)
31static char sccsid[] = "@(#)telldir.c 8.1 (Berkeley) 6/4/93";
32#endif /* LIBC_SCCS and not lint */
33#include <sys/cdefs.h>
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

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

26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#if defined(LIBC_SCCS) && !defined(lint)
31static char sccsid[] = "@(#)telldir.c 8.1 (Berkeley) 6/4/93";
32#endif /* LIBC_SCCS and not lint */
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: stable/10/lib/libc/gen/telldir.c 270002 2014-08-14 20:20:21Z jhb $");
34__FBSDID("$FreeBSD: stable/10/lib/libc/gen/telldir.c 282979 2015-05-15 15:49:24Z julian $");
35
36#include "namespace.h"
37#include <sys/param.h>
38#include <sys/queue.h>
39#include <dirent.h>
40#include <pthread.h>
41#include <stdlib.h>
42#include <unistd.h>

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

96 LIST_FOREACH(lp, &dirp->dd_td->td_locq, loc_lqe) {
97 if (lp->loc_index == loc)
98 break;
99 }
100 if (lp == NULL)
101 return;
102 if (lp->loc_loc == dirp->dd_loc && lp->loc_seek == dirp->dd_seek)
103 return;
35
36#include "namespace.h"
37#include <sys/param.h>
38#include <sys/queue.h>
39#include <dirent.h>
40#include <pthread.h>
41#include <stdlib.h>
42#include <unistd.h>

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

96 LIST_FOREACH(lp, &dirp->dd_td->td_locq, loc_lqe) {
97 if (lp->loc_index == loc)
98 break;
99 }
100 if (lp == NULL)
101 return;
102 if (lp->loc_loc == dirp->dd_loc && lp->loc_seek == dirp->dd_seek)
103 return;
104
105 /* If it's within the same chunk of data, don't bother reloading. */
106 if (lp->loc_seek == dirp->dd_seek) {
107 /*
108 * If we go back to 0 don't make the next readdir
109 * trigger a call to getdirentries().
110 */
111 if (lp->loc_loc == 0)
112 dirp->dd_flags |= __DTF_SKIPREAD;
113 dirp->dd_loc = lp->loc_loc;
114 return;
115 }
104 (void) lseek(dirp->dd_fd, (off_t)lp->loc_seek, SEEK_SET);
105 dirp->dd_seek = lp->loc_seek;
106 dirp->dd_loc = 0;
116 (void) lseek(dirp->dd_fd, (off_t)lp->loc_seek, SEEK_SET);
117 dirp->dd_seek = lp->loc_seek;
118 dirp->dd_loc = 0;
119 dirp->dd_flags &= ~__DTF_SKIPREAD; /* current contents are invalid */
107 while (dirp->dd_loc < lp->loc_loc) {
108 dp = _readdir_unlocked(dirp, 0);
109 if (dp == NULL)
110 break;
111 }
112}
113
114/*
120 while (dirp->dd_loc < lp->loc_loc) {
121 dp = _readdir_unlocked(dirp, 0);
122 if (dp == NULL)
123 break;
124 }
125}
126
127/*
128 * After readdir returns the last entry in a block, a call to telldir
129 * returns a location that is after the end of that last entry.
130 * However, that location doesn't refer to a valid directory entry.
131 * Ideally, the call to telldir would return a location that refers to
132 * the first entry in the next block. That location is not known
133 * until the next block is read, so readdir calls this function after
134 * fetching a new block to fix any such telldir locations.
135 */
136void
137_fixtelldir(DIR *dirp, long oldseek, long oldloc)
138{
139 struct ddloc *lp;
140
141 lp = LIST_FIRST(&dirp->dd_td->td_locq);
142 if (lp != NULL) {
143 if (lp->loc_loc == oldloc &&
144 lp->loc_seek == oldseek) {
145 lp->loc_seek = dirp->dd_seek;
146 lp->loc_loc = dirp->dd_loc;
147 }
148 }
149}
150
151/*
115 * Reclaim memory for telldir cookies which weren't used.
116 */
117void
118_reclaim_telldir(dirp)
119 DIR *dirp;
120{
121 struct ddloc *lp;
122 struct ddloc *templp;
123
124 lp = LIST_FIRST(&dirp->dd_td->td_locq);
125 while (lp != NULL) {
126 templp = lp;
127 lp = LIST_NEXT(lp, loc_lqe);
128 free(templp);
129 }
130 LIST_INIT(&dirp->dd_td->td_locq);
131}
152 * Reclaim memory for telldir cookies which weren't used.
153 */
154void
155_reclaim_telldir(dirp)
156 DIR *dirp;
157{
158 struct ddloc *lp;
159 struct ddloc *templp;
160
161 lp = LIST_FIRST(&dirp->dd_td->td_locq);
162 while (lp != NULL) {
163 templp = lp;
164 lp = LIST_NEXT(lp, loc_lqe);
165 free(templp);
166 }
167 LIST_INIT(&dirp->dd_td->td_locq);
168}