Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/osutil.c @ 5421:9b5d626be8ba
osutil: cleanups
- use tabs
- eliminate old-style function pointer calls
- eliminate weird scoping
- eliminate assignment-in-iff
- use !foo rather than foo == NULL
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 08 Oct 2007 18:47:06 -0500 |
| parents | ca890c0c3f1f |
| children | a3ba7ef98c94 |
| rev | line source |
|---|---|
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 /* |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 osutil.c - native operating system services |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 Copyright 2007 Matt Mackall and others |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 This software may be used and distributed according to the terms of |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 the GNU General Public License, incorporated herein by reference. |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 */ |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 #define _ATFILE_SOURCE |
|
5397
11caa374f497
osutil.c: include Python.h before the other headers
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5396
diff
changeset
|
11 #include <Python.h> |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 #include <alloca.h> |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 #include <dirent.h> |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 #include <fcntl.h> |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 #include <string.h> |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 #include <sys/stat.h> |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 #include <sys/types.h> |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 #include <unistd.h> |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
19 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 struct listdir_stat { |
| 5421 | 21 PyObject_HEAD |
| 22 struct stat st; | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
23 }; |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
24 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
25 #define listdir_slot(name) \ |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
26 static PyObject *listdir_stat_##name(PyObject *self, void *x) \ |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
27 { \ |
| 5421 | 28 return PyInt_FromLong(((struct listdir_stat *)self)->st.name); \ |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
29 } |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
30 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
31 listdir_slot(st_dev); |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
32 listdir_slot(st_mode); |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
33 listdir_slot(st_nlink); |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
34 listdir_slot(st_size); |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
35 listdir_slot(st_mtime); |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
36 listdir_slot(st_ctime); |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
37 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
38 static struct PyGetSetDef listdir_stat_getsets[] = { |
| 5421 | 39 {"st_dev", listdir_stat_st_dev, 0, 0, 0}, |
| 40 {"st_mode", listdir_stat_st_mode, 0, 0, 0}, | |
| 41 {"st_nlink", listdir_stat_st_nlink, 0, 0, 0}, | |
| 42 {"st_size", listdir_stat_st_size, 0, 0, 0}, | |
| 43 {"st_mtime", listdir_stat_st_mtime, 0, 0, 0}, | |
| 44 {"st_ctime", listdir_stat_st_ctime, 0, 0, 0}, | |
| 45 {0, 0, 0, 0, 0} | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
46 }; |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
47 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
48 static PyObject *listdir_stat_new(PyTypeObject *t, PyObject *a, PyObject *k) |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
49 { |
| 5421 | 50 return t->tp_alloc(t, 0); |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
51 } |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
52 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
53 static void listdir_stat_dealloc(PyObject *o) |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
54 { |
| 5421 | 55 o->ob_type->tp_free(o); |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
56 } |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
57 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
58 static PyTypeObject listdir_stat_type = { |
| 5421 | 59 PyObject_HEAD_INIT(NULL) |
| 60 0, /*ob_size*/ | |
| 61 "osutil.stat", /*tp_name*/ | |
| 62 sizeof(struct listdir_stat), /*tp_basicsize*/ | |
| 63 0, /*tp_itemsize*/ | |
| 64 (destructor)listdir_stat_dealloc, /*tp_dealloc*/ | |
| 65 0, /*tp_print*/ | |
| 66 0, /*tp_getattr*/ | |
| 67 0, /*tp_setattr*/ | |
| 68 0, /*tp_compare*/ | |
| 69 0, /*tp_repr*/ | |
| 70 0, /*tp_as_number*/ | |
| 71 0, /*tp_as_sequence*/ | |
| 72 0, /*tp_as_mapping*/ | |
| 73 0, /*tp_hash */ | |
| 74 0, /*tp_call*/ | |
| 75 0, /*tp_str*/ | |
| 76 0, /*tp_getattro*/ | |
| 77 0, /*tp_setattro*/ | |
| 78 0, /*tp_as_buffer*/ | |
| 79 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ | |
| 80 "stat objects", /* tp_doc */ | |
| 81 0, /* tp_traverse */ | |
| 82 0, /* tp_clear */ | |
| 83 0, /* tp_richcompare */ | |
| 84 0, /* tp_weaklistoffset */ | |
| 85 0, /* tp_iter */ | |
| 86 0, /* tp_iternext */ | |
| 87 0, /* tp_methods */ | |
| 88 0, /* tp_members */ | |
| 89 listdir_stat_getsets, /* tp_getset */ | |
| 90 0, /* tp_base */ | |
| 91 0, /* tp_dict */ | |
| 92 0, /* tp_descr_get */ | |
| 93 0, /* tp_descr_set */ | |
| 94 0, /* tp_dictoffset */ | |
| 95 0, /* tp_init */ | |
| 96 0, /* tp_alloc */ | |
| 97 listdir_stat_new, /* tp_new */ | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
98 }; |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
99 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
100 static inline int mode_to_kind(int mode) |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
101 { |
| 5421 | 102 if (S_ISREG(mode)) return S_IFREG; |
| 103 if (S_ISDIR(mode)) return S_IFDIR; | |
| 104 if (S_ISLNK(mode)) return S_IFLNK; | |
| 105 if (S_ISBLK(mode)) return S_IFBLK; | |
| 106 if (S_ISCHR(mode)) return S_IFCHR; | |
| 107 if (S_ISFIFO(mode)) return S_IFIFO; | |
| 108 if (S_ISSOCK(mode)) return S_IFSOCK; | |
| 109 return mode; | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
110 } |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
111 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
112 static PyObject *listdir(PyObject *self, PyObject *args, PyObject *kwargs) |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
113 { |
|
5416
ca890c0c3f1f
osutil.c: style fix - delete trailing end-of-line spaces
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
5398
diff
changeset
|
114 static char *kwlist[] = { "path", "stat", NULL }; |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
115 PyObject *statobj = NULL; |
| 5421 | 116 DIR *dir = NULL; |
| 117 struct dirent *ent; | |
| 118 PyObject *list = NULL; | |
| 119 PyObject *ctor_args = NULL; | |
| 120 int all_kinds = 1; | |
| 121 char *full_path; | |
| 122 int path_len; | |
| 123 int do_stat; | |
| 124 char *path; | |
| 125 int ret; | |
| 126 ssize_t size; | |
| 127 ssize_t i; | |
| 128 int dfd; | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
129 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
130 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|O:listdir", kwlist, |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
131 &path, &path_len, &statobj)) |
| 5421 | 132 goto bail; |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
133 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
134 do_stat = statobj && PyObject_IsTrue(statobj); |
|
5416
ca890c0c3f1f
osutil.c: style fix - delete trailing end-of-line spaces
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
5398
diff
changeset
|
135 |
| 5421 | 136 dir = opendir(path); |
| 137 if (!dir) { | |
| 138 list = PyErr_SetFromErrnoWithFilename(PyExc_OSError, path); | |
| 139 goto bail; | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
140 } |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
141 |
| 5421 | 142 list = PyList_New(0); |
| 143 if (!list) | |
| 144 goto bail; | |
|
5416
ca890c0c3f1f
osutil.c: style fix - delete trailing end-of-line spaces
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
5398
diff
changeset
|
145 |
| 5421 | 146 full_path = alloca(path_len + PATH_MAX + 2); |
| 147 memcpy(full_path, path, path_len); | |
| 148 full_path[path_len] = '/'; | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
149 |
| 5421 | 150 for (ent = readdir(dir); ent; ent = readdir(dir)) { |
| 151 PyObject *name = NULL; | |
| 152 PyObject *py_kind = NULL; | |
| 153 PyObject *val = NULL; | |
| 154 unsigned char d_type; | |
| 155 int kind = -1; | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
156 |
| 5421 | 157 if (!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) |
| 158 continue; | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
159 |
| 5421 | 160 #ifdef DT_REG |
| 161 if (do_stat) | |
| 162 d_type = 0; | |
| 163 else | |
| 164 d_type = ent->d_type; | |
| 165 #else | |
| 166 d_type = 0; | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
167 #endif |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
168 |
| 5421 | 169 switch (d_type) { |
| 170 #ifdef DT_REG | |
| 171 case DT_REG: kind = S_IFREG; break; | |
| 172 case DT_DIR: kind = S_IFDIR; break; | |
| 173 case DT_LNK: kind = S_IFLNK; break; | |
| 174 case DT_BLK: kind = S_IFBLK; break; | |
| 175 case DT_CHR: kind = S_IFCHR; break; | |
| 176 case DT_FIFO: kind = S_IFIFO; break; | |
| 177 case DT_SOCK: kind = S_IFSOCK; break; | |
| 178 #endif | |
| 179 default: | |
| 180 if (all_kinds) | |
| 181 all_kinds = 0; | |
| 182 break; | |
| 183 } | |
|
5416
ca890c0c3f1f
osutil.c: style fix - delete trailing end-of-line spaces
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
5398
diff
changeset
|
184 |
| 5421 | 185 name = PyString_FromString(ent->d_name); |
| 186 if (kind != -1) | |
| 187 py_kind = PyInt_FromLong(kind); | |
| 188 else { | |
| 189 py_kind = Py_None; | |
| 190 Py_INCREF(Py_None); | |
| 191 } | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
192 |
| 5421 | 193 val = PyTuple_New(do_stat ? 3 : 2); |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
194 |
| 5421 | 195 if (!name || !py_kind || !val) { |
| 196 Py_XDECREF(name); | |
| 197 Py_XDECREF(py_kind); | |
| 198 Py_XDECREF(val); | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
199 goto bail; |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
200 } |
|
5416
ca890c0c3f1f
osutil.c: style fix - delete trailing end-of-line spaces
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
5398
diff
changeset
|
201 |
| 5421 | 202 PyTuple_SET_ITEM(val, 0, name); |
| 203 PyTuple_SET_ITEM(val, 1, py_kind); | |
| 204 if (do_stat) { | |
| 205 PyTuple_SET_ITEM(val, 2, Py_None); | |
| 206 Py_INCREF(Py_None); | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
207 } |
| 5421 | 208 |
| 209 PyList_Append(list, val); | |
| 210 Py_DECREF(val); | |
| 211 } | |
| 212 | |
| 213 PyList_Sort(list); | |
| 214 size = PyList_Size(list); | |
| 215 #ifdef AT_SYMLINK_NOFOLLOW | |
| 216 dfd = dirfd(dir); | |
| 217 #endif | |
| 218 | |
| 219 if (do_stat || !all_kinds) { | |
| 220 for (i = 0; i < size; i++) { | |
| 221 PyObject *elt = PyList_GetItem(list, i); | |
| 222 char *name = PyString_AsString(PyTuple_GET_ITEM(elt, 0)); | |
| 223 PyObject *py_st = NULL; | |
| 224 PyObject *py_kind = PyTuple_GET_ITEM(elt, 1); | |
| 225 int kind; | |
| 226 | |
| 227 kind = py_kind == Py_None ? -1 : PyInt_AsLong(py_kind); | |
| 228 | |
| 229 if (kind != -1 && !do_stat) | |
| 230 continue; | |
| 231 | |
| 232 strcpy(full_path + path_len + 1, name); | |
| 233 | |
| 234 if (do_stat) { | |
| 235 struct listdir_stat *st; | |
| 236 | |
| 237 if (!ctor_args) { | |
| 238 ctor_args = PyTuple_New(0); | |
| 239 if (!ctor_args) | |
| 240 goto bail; | |
| 241 } | |
| 242 | |
| 243 st = (struct listdir_stat *) | |
| 244 PyObject_CallObject((PyObject *)&listdir_stat_type, | |
| 245 ctor_args); | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
246 |
| 5421 | 247 if (!st) |
| 248 goto bail; | |
| 249 #ifdef AT_SYMLINK_NOFOLLOW | |
| 250 ret = fstatat(dfd, name, &st->st, AT_SYMLINK_NOFOLLOW); | |
| 251 #else | |
| 252 ret = lstat(full_path, &st->st); | |
| 253 #endif | |
| 254 if (ret == -1) { | |
| 255 list = PyErr_SetFromErrnoWithFilename(PyExc_OSError, | |
| 256 full_path); | |
| 257 goto bail; | |
| 258 } | |
| 259 if (kind == -1) | |
| 260 kind = mode_to_kind(st->st.st_mode); | |
| 261 py_st = (PyObject *)st; | |
| 262 } else { | |
| 263 struct stat buf; | |
| 264 #ifdef AT_SYMLINK_NOFOLLOW | |
| 265 ret = fstatat(dfd, ent->d_name, &buf, AT_SYMLINK_NOFOLLOW); | |
| 266 #else | |
| 267 ret = lstat(full_path, &buf); | |
| 268 #endif | |
| 269 if (ret == -1) { | |
| 270 list = PyErr_SetFromErrnoWithFilename(PyExc_OSError, | |
| 271 full_path); | |
| 272 goto bail; | |
| 273 } | |
| 274 if (kind == -1) | |
| 275 kind = mode_to_kind(buf.st_mode); | |
| 276 } | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
277 |
| 5421 | 278 if (py_kind == Py_None && kind != -1) { |
| 279 py_kind = PyInt_FromLong(kind); | |
| 280 if (!py_kind) | |
| 281 goto bail; | |
| 282 Py_XDECREF(Py_None); | |
| 283 PyTuple_SET_ITEM(elt, 1, py_kind); | |
| 284 } | |
| 285 | |
| 286 if (do_stat) { | |
| 287 if (!py_st) { | |
| 288 py_st = Py_None; | |
| 289 Py_INCREF(Py_None); | |
| 290 } | |
| 291 PyTuple_SET_ITEM(elt, 2, py_st); | |
| 292 } | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
293 } |
| 5421 | 294 } |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
295 |
| 5421 | 296 goto done; |
| 297 | |
| 298 bail: | |
| 299 Py_XDECREF(list); | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
300 |
| 5421 | 301 done: |
| 302 Py_XDECREF(ctor_args); | |
| 303 if (dir) | |
| 304 closedir(dir); | |
| 305 return list; | |
| 306 } | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
307 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
308 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
309 static char osutil_doc[] = "Native operating system services."; |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
310 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
311 static PyMethodDef methods[] = { |
| 5421 | 312 {"listdir", (PyCFunction)listdir, METH_VARARGS | METH_KEYWORDS, |
| 313 "list a directory\n"}, | |
| 314 {NULL, NULL} | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
315 }; |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
316 |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
317 PyMODINIT_FUNC initosutil(void) |
|
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
318 { |
| 5421 | 319 if (PyType_Ready(&listdir_stat_type) == -1) |
| 320 return; | |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
321 |
| 5421 | 322 Py_InitModule3("osutil", methods, osutil_doc); |
|
5396
5105b119edd2
Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
323 } |