##// END OF EJS Templates
osutil: major listdir cleanup
Matt Mackall -
r7031:19e8d034 default
parent child Browse files
Show More
@@ -96,208 +96,119 b' static PyTypeObject listdir_stat_type = '
96 listdir_stat_new, /* tp_new */
96 listdir_stat_new, /* tp_new */
97 };
97 };
98
98
99 static PyObject *listfiles(PyObject *list, DIR *dir,
99 #ifdef AT_SYMLINK_NOFOLLOW
100 int keep_stat, int *need_stat)
100 #define USEFDOPEN 1
101 {
102 struct dirent *ent;
103 PyObject *name, *py_kind, *val;
104
105 #ifdef DT_REG
106 *need_stat = 0;
107 #else
101 #else
108 *need_stat = 1;
102 #define USEFDOPEN 0
109 #endif
110
111 for (ent = readdir(dir); ent; ent = readdir(dir)) {
112 int kind = -1;
113
114 if (!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, ".."))
115 continue;
116
117 #ifdef DT_REG
118 if (!keep_stat)
119 switch (ent->d_type) {
120 case DT_REG: kind = S_IFREG; break;
121 case DT_DIR: kind = S_IFDIR; break;
122 case DT_LNK: kind = S_IFLNK; break;
123 case DT_BLK: kind = S_IFBLK; break;
124 case DT_CHR: kind = S_IFCHR; break;
125 case DT_FIFO: kind = S_IFIFO; break;
126 case DT_SOCK: kind = S_IFSOCK; break;
127 default:
128 *need_stat = 0;
129 break;
130 }
131 #endif
103 #endif
132
104
133 if (kind != -1)
105 int entkind(struct dirent *ent)
134 py_kind = PyInt_FromLong(kind);
135 else {
136 py_kind = Py_None;
137 Py_INCREF(Py_None);
138 }
139
140 val = PyTuple_New(keep_stat ? 3 : 2);
141 name = PyString_FromString(ent->d_name);
142
143 if (!name || !py_kind || !val) {
144 Py_XDECREF(name);
145 Py_XDECREF(py_kind);
146 Py_XDECREF(val);
147 return PyErr_NoMemory();
148 }
149
150 PyTuple_SET_ITEM(val, 0, name);
151 PyTuple_SET_ITEM(val, 1, py_kind);
152 if (keep_stat) {
153 PyTuple_SET_ITEM(val, 2, Py_None);
154 Py_INCREF(Py_None);
155 }
156
157 PyList_Append(list, val);
158 Py_DECREF(val);
159 }
160
161 return 0;
162 }
163
164 static PyObject *statfiles(PyObject *list, PyObject *ctor_args, int keep,
165 char *path, int len, int dfd)
166 {
106 {
167 struct stat buf;
107 #ifdef DT_REG
168 struct stat *stp = &buf;
108 switch (ent->d_type) {
169 int kind;
109 case DT_REG: return S_IFREG;
170 int ret;
110 case DT_DIR: return S_IFDIR;
171 ssize_t i;
111 case DT_LNK: return S_IFLNK;
172 ssize_t size = PyList_Size(list);
112 case DT_BLK: return S_IFBLK;
173
113 case DT_CHR: return S_IFCHR;
174 for (i = 0; i < size; i++) {
114 case DT_FIFO: return S_IFIFO;
175 PyObject *elt = PyList_GetItem(list, i);
115 case DT_SOCK: return S_IFSOCK;
176 char *name = PyString_AsString(PyTuple_GET_ITEM(elt, 0));
177 PyObject *py_st = NULL;
178 PyObject *py_kind = PyTuple_GET_ITEM(elt, 1);
179
180 kind = py_kind == Py_None ? -1 : PyInt_AsLong(py_kind);
181 if (kind != -1 && !keep)
182 continue;
183
184 strncpy(path + len + 1, name, PATH_MAX - len);
185 path[PATH_MAX] = 0;
186
187 if (keep) {
188 py_st = PyObject_CallObject(
189 (PyObject *)&listdir_stat_type, ctor_args);
190 if (!py_st)
191 return PyErr_NoMemory();
192 stp = &((struct listdir_stat *)py_st)->st;
193 PyTuple_SET_ITEM(elt, 2, py_st);
194 }
116 }
195
196 #ifdef AT_SYMLINK_NOFOLLOW
197 ret = fstatat(dfd, name, stp, AT_SYMLINK_NOFOLLOW);
198 #else
199 ret = lstat(path, stp);
200 #endif
117 #endif
201 if (ret == -1)
202 return PyErr_SetFromErrnoWithFilename(PyExc_OSError,
203 path);
204
205 if (kind == -1) {
206 if (S_ISREG(stp->st_mode))
207 kind = S_IFREG;
208 else if (S_ISDIR(stp->st_mode))
209 kind = S_IFDIR;
210 else if (S_ISLNK(stp->st_mode))
211 kind = S_IFLNK;
212 else if (S_ISBLK(stp->st_mode))
213 kind = S_IFBLK;
214 else if (S_ISCHR(stp->st_mode))
215 kind = S_IFCHR;
216 else if (S_ISFIFO(stp->st_mode))
217 kind = S_IFIFO;
218 else if (S_ISSOCK(stp->st_mode))
219 kind = S_IFSOCK;
220 else
221 kind = stp->st_mode;
222 }
223
224 if (py_kind == Py_None && kind != -1) {
225 py_kind = PyInt_FromLong(kind);
226 if (!py_kind)
227 return PyErr_NoMemory();
228 Py_XDECREF(Py_None);
229 PyTuple_SET_ITEM(elt, 1, py_kind);
230 }
231 }
232
233 return 0;
234 }
118 }
235
119
236 static PyObject *listdir(PyObject *self, PyObject *args, PyObject *kwargs)
120 static PyObject *listdir(PyObject *self, PyObject *args, PyObject *kwargs)
237 {
121 {
238 static char *kwlist[] = { "path", "stat", NULL };
122 static char *kwlist[] = { "path", "stat", NULL };
239 DIR *dir = NULL;
123 PyObject *statflag = NULL, *list, *elem, *stat, *ret = NULL;
240 PyObject *statobj = NULL;
124 char fullpath[PATH_MAX + 10], *path;
241 PyObject *list = NULL;
125 int pathlen, keepstat, kind, dfd, err;
242 PyObject *err = NULL;
126 struct stat st;
243 PyObject *ctor_args = NULL;
127 struct dirent *ent;
244 char *path;
128 DIR *dir;
245 char full_path[PATH_MAX + 10];
246 int path_len;
247 int need_stat, keep_stat;
248 int dfd;
249
129
250 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|O:listdir", kwlist,
130 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|O:listdir", kwlist,
251 &path, &path_len, &statobj))
131 &path, &pathlen, &statflag))
252 goto bail;
132 goto error_parse;
253
133
254 keep_stat = statobj && PyObject_IsTrue(statobj);
134 strncpy(fullpath, path, PATH_MAX);
135 fullpath[pathlen] = '/';
136 keepstat = statflag && PyObject_IsTrue(statflag);
255
137
256 #ifdef AT_SYMLINK_NOFOLLOW
138 if (USEFDOPEN) {
257 dfd = open(path, O_RDONLY);
139 dfd = open(path, O_RDONLY);
258 if (dfd != -1)
140 if (dfd == -1) {
141 PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
142 goto error_parse;
143 }
259 dir = fdopendir(dfd);
144 dir = fdopendir(dfd);
260 #else
145 } else
261 dir = opendir(path);
146 dir = opendir(path);
262 dfd = -1;
263 #endif
264 if (!dir) {
147 if (!dir) {
265 err = PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
148 PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
266 goto bail;
149 goto error_dir;
267 }
150 }
268
151
269 list = PyList_New(0);
152 list = PyList_New(0);
270 ctor_args = PyTuple_New(0);
153 if (!list)
271 if (!list || !ctor_args)
154 goto error_list;
272 goto bail;
155
156 while ((ent = readdir(dir))) {
157 if (!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, ".."))
158 continue;
273
159
274 strncpy(full_path, path, PATH_MAX);
160 kind = entkind(ent);
275 full_path[path_len] = '/';
161 if (kind == -1 || keepstat) {
162 if (USEFDOPEN)
163 err = fstatat(dfd, ent->d_name, &st,
164 AT_SYMLINK_NOFOLLOW);
165 else {
166 strncpy(fullpath + pathlen + 1, ent->d_name,
167 PATH_MAX - pathlen);
168 fullpath[PATH_MAX] = 0;
169 err = lstat(fullpath, &st);
170 }
171 if (err == -1) {
172 strncpy(fullpath + pathlen + 1, ent->d_name,
173 PATH_MAX - pathlen);
174 fullpath[PATH_MAX] = 0;
175 PyErr_SetFromErrnoWithFilename(PyExc_OSError,
176 fullpath);
177 goto error;
178 }
179 kind = st.st_mode & S_IFMT;
180 }
276
181
277 err = listfiles(list, dir, keep_stat, &need_stat);
182 if (keepstat) {
278 if (err)
183 stat = PyObject_CallObject((PyObject *)&listdir_stat_type, NULL);
279 goto bail;
184 if (!stat)
185 goto error;
186 memcpy(&((struct listdir_stat *)stat)->st, &st, sizeof(st));
187 elem = Py_BuildValue("siN", ent->d_name, kind, stat);
188 } else
189 elem = Py_BuildValue("si", ent->d_name, kind);
190 if (!elem)
191 goto error;
192
193 PyList_Append(list, elem);
194 Py_DECREF(elem);
195 }
280
196
281 PyList_Sort(list);
197 PyList_Sort(list);
282
198 ret = list;
283 if (!keep_stat && !need_stat)
199 Py_INCREF(ret);
284 goto done;
285
286 err = statfiles(list, ctor_args, keep_stat, full_path, path_len, dfd);
287 if (!err)
288 goto done;
289
200
290 bail:
201 error:
291 Py_XDECREF(list);
202 Py_DECREF(list);
292
203 error_list:
293 done:
294 Py_XDECREF(ctor_args);
295 if (dir)
296 closedir(dir);
204 closedir(dir);
297 return err ? err : list;
205 error_dir:
206 if (USEFDOPEN)
207 close(dfd);
208 error_parse:
209 return ret;
298 }
210 }
299
211
300
301 static char osutil_doc[] = "Native operating system services.";
212 static char osutil_doc[] = "Native operating system services.";
302
213
303 static PyMethodDef methods[] = {
214 static PyMethodDef methods[] = {
General Comments 0
You need to be logged in to leave comments. Login now