mercurial/osutil.c
author Matt Mackall <mpm@selenic.com>
Mon, 08 Oct 2007 18:47:14 -0500
changeset 5423 e5f238a8b0d2
parent 5422 a3ba7ef98c94
child 5424 005638db9d0c
permissions -rw-r--r--
osutil: more cleanups - eliminate a level of nesting - untab targets of gotos
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    21
	PyObject_HEAD
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    39
	{"st_dev", listdir_stat_st_dev, 0, 0, 0},
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    40
	{"st_mode", listdir_stat_st_mode, 0, 0, 0},
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    41
	{"st_nlink", listdir_stat_st_nlink, 0, 0, 0},
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    42
	{"st_size", listdir_stat_st_size, 0, 0, 0},
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    43
	{"st_mtime", listdir_stat_st_mtime, 0, 0, 0},
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    44
	{"st_ctime", listdir_stat_st_ctime, 0, 0, 0},
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    59
	PyObject_HEAD_INIT(NULL)
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    60
	0,                         /*ob_size*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    61
	"osutil.stat",             /*tp_name*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    62
	sizeof(struct listdir_stat), /*tp_basicsize*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    63
	0,                         /*tp_itemsize*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    64
	(destructor)listdir_stat_dealloc, /*tp_dealloc*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    65
	0,                         /*tp_print*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    66
	0,                         /*tp_getattr*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    67
	0,                         /*tp_setattr*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    68
	0,                         /*tp_compare*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    69
	0,                         /*tp_repr*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    70
	0,                         /*tp_as_number*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    71
	0,                         /*tp_as_sequence*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    72
	0,                         /*tp_as_mapping*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    73
	0,                         /*tp_hash */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    74
	0,                         /*tp_call*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    75
	0,                         /*tp_str*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    76
	0,                         /*tp_getattro*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    77
	0,                         /*tp_setattro*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    78
	0,                         /*tp_as_buffer*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    79
	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    80
	"stat objects",            /* tp_doc */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    81
	0,                         /* tp_traverse */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    82
	0,                         /* tp_clear */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    83
	0,                         /* tp_richcompare */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    84
	0,                         /* tp_weaklistoffset */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    85
	0,                         /* tp_iter */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    86
	0,                         /* tp_iternext */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    87
	0,                         /* tp_methods */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    88
	0,                         /* tp_members */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    89
	listdir_stat_getsets,      /* tp_getset */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    90
	0,                         /* tp_base */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    91
	0,                         /* tp_dict */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    92
	0,                         /* tp_descr_get */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    93
	0,                         /* tp_descr_set */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    94
	0,                         /* tp_dictoffset */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    95
	0,                         /* tp_init */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    96
	0,                         /* tp_alloc */
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
    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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   102
	if (S_ISREG(mode)) return S_IFREG;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   103
	if (S_ISDIR(mode)) return S_IFDIR;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   104
	if (S_ISLNK(mode)) return S_IFLNK;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   105
	if (S_ISBLK(mode)) return S_IFBLK;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   106
	if (S_ISCHR(mode)) return S_IFCHR;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   107
	if (S_ISFIFO(mode)) return S_IFIFO;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   108
	if (S_ISSOCK(mode)) return S_IFSOCK;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   116
	DIR *dir = NULL;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   117
	struct dirent *ent;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   118
	PyObject *list = NULL;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   119
	PyObject *ctor_args = NULL;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   120
	int all_kinds = 1;
5422
a3ba7ef98c94 osutil: eliminate alloca call
Matt Mackall <mpm@selenic.com>
parents: 5421
diff changeset
   121
	char full_path[PATH_MAX + 10];
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   122
	int path_len;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   123
	int do_stat;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   124
	char *path;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   125
	int ret;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   126
	ssize_t size;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   127
	ssize_t i;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   136
	dir = opendir(path);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   137
	if (!dir) {
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   138
		list = PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   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
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   142
	list = PyList_New(0);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   143
	if (!list)
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   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
5422
a3ba7ef98c94 osutil: eliminate alloca call
Matt Mackall <mpm@selenic.com>
parents: 5421
diff changeset
   146
	strncpy(full_path, path, PATH_MAX);
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   147
	full_path[path_len] = '/';
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   148
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   149
	for (ent = readdir(dir); ent; ent = readdir(dir)) {
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   150
		PyObject *name = NULL;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   151
		PyObject *py_kind = NULL;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   152
		PyObject *val = NULL;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   153
		unsigned char d_type;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   154
		int kind = -1;
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   155
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   156
		if (!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, ".."))
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   157
			continue;
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   158
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   159
#ifdef DT_REG
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   160
		if (do_stat)
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   161
			d_type = 0;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   162
		else
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   163
			d_type = ent->d_type;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   164
#else
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   165
		d_type = 0;
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   166
#endif
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   167
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   168
		switch (d_type) {
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   169
#ifdef DT_REG
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   170
		case DT_REG: kind = S_IFREG; break;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   171
		case DT_DIR: kind = S_IFDIR; break;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   172
		case DT_LNK: kind = S_IFLNK; break;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   173
		case DT_BLK: kind = S_IFBLK; break;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   174
		case DT_CHR: kind = S_IFCHR; break;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   175
		case DT_FIFO: kind = S_IFIFO; break;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   176
		case DT_SOCK: kind = S_IFSOCK; break;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   177
#endif
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   178
		default:
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   179
			if (all_kinds)
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   180
				all_kinds = 0;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   181
			break;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   182
		}
5416
ca890c0c3f1f osutil.c: style fix - delete trailing end-of-line spaces
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 5398
diff changeset
   183
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   184
		name = PyString_FromString(ent->d_name);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   185
		if (kind != -1)
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   186
			py_kind = PyInt_FromLong(kind);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   187
		else {
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   188
			py_kind = Py_None;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   189
			Py_INCREF(Py_None);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   190
		}
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   191
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   192
		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
   193
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   194
		if (!name || !py_kind || !val) {
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   195
			Py_XDECREF(name);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   196
			Py_XDECREF(py_kind);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   197
			Py_XDECREF(val);
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   198
			goto bail;
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   199
		}
5416
ca890c0c3f1f osutil.c: style fix - delete trailing end-of-line spaces
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 5398
diff changeset
   200
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   201
		PyTuple_SET_ITEM(val, 0, name);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   202
		PyTuple_SET_ITEM(val, 1, py_kind);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   203
		if (do_stat) {
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   204
			PyTuple_SET_ITEM(val, 2, Py_None);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   205
			Py_INCREF(Py_None);
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   206
		}
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   207
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   208
		PyList_Append(list, val);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   209
		Py_DECREF(val);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   210
	}
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   211
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   212
	PyList_Sort(list);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   213
	size = PyList_Size(list);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   214
#ifdef AT_SYMLINK_NOFOLLOW
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   215
	dfd = dirfd(dir);
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   216
#endif
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   217
5423
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   218
	if (!(do_stat || !all_kinds))
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   219
		goto done;
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   220
5423
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   221
	for (i = 0; i < size; i++) {
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   222
		PyObject *elt = PyList_GetItem(list, i);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   223
		char *name = PyString_AsString(PyTuple_GET_ITEM(elt, 0));
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   224
		PyObject *py_st = NULL;
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   225
		PyObject *py_kind = PyTuple_GET_ITEM(elt, 1);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   226
		int kind;
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   227
5423
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   228
		kind = py_kind == Py_None ? -1 : PyInt_AsLong(py_kind);
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   229
5423
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   230
		if (kind != -1 && !do_stat)
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   231
			continue;
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   232
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   233
		strncat(full_path + path_len + 1, name, PATH_MAX - path_len);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   234
		full_path[PATH_MAX] = 0;
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   235
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   236
		if (do_stat) {
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   237
			struct listdir_stat *st;
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   238
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   239
			if (!ctor_args) {
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   240
				ctor_args = PyTuple_New(0);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   241
				if (!ctor_args)
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   242
					goto bail;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   243
			}
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   244
5423
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   245
			st = (struct listdir_stat *)
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   246
				PyObject_CallObject((PyObject *)&listdir_stat_type,
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   247
						    ctor_args);
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   248
5423
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   249
			if (!st)
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   250
				goto bail;
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   251
#ifdef AT_SYMLINK_NOFOLLOW
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   252
			ret = fstatat(dfd, name, &st->st, AT_SYMLINK_NOFOLLOW);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   253
#else
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   254
			ret = lstat(full_path, &st->st);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   255
#endif
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   256
			if (ret == -1) {
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   257
				list = PyErr_SetFromErrnoWithFilename(PyExc_OSError,
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   258
									      full_path);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   259
				goto bail;
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   260
			}
5423
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   261
			if (kind == -1)
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   262
				kind = mode_to_kind(st->st.st_mode);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   263
			py_st = (PyObject *)st;
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   264
		} else {
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   265
			struct stat buf;
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   266
#ifdef AT_SYMLINK_NOFOLLOW
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   267
			ret = fstatat(dfd, ent->d_name, &buf, AT_SYMLINK_NOFOLLOW);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   268
#else
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   269
			ret = lstat(full_path, &buf);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   270
#endif
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   271
			if (ret == -1) {
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   272
				list = PyErr_SetFromErrnoWithFilename(PyExc_OSError,
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   273
									      full_path);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   274
				goto bail;
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   275
			}
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   276
			if (kind == -1)
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   277
				kind = mode_to_kind(buf.st_mode);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   278
		}
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   279
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   280
		if (py_kind == Py_None && kind != -1) {
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   281
			py_kind = PyInt_FromLong(kind);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   282
			if (!py_kind)
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   283
				goto bail;
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   284
			Py_XDECREF(Py_None);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   285
			PyTuple_SET_ITEM(elt, 1, py_kind);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   286
		}
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   287
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   288
		if (do_stat) {
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   289
			if (!py_st) {
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   290
				py_st = Py_None;
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   291
				Py_INCREF(Py_None);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   292
			}
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   293
			PyTuple_SET_ITEM(elt, 2, py_st);
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   294
		}
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   295
	}
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   296
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   297
	goto done;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   298
5423
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   299
 bail:
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   300
	Py_XDECREF(list);
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   301
5423
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   302
 done:
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   303
	Py_XDECREF(ctor_args);
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   304
	if (dir)
e5f238a8b0d2 osutil: more cleanups
Matt Mackall <mpm@selenic.com>
parents: 5422
diff changeset
   305
		closedir(dir);
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   306
	return list;
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   307
}
5396
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
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   310
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
   311
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   312
static PyMethodDef methods[] = {
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   313
	{"listdir", (PyCFunction)listdir, METH_VARARGS | METH_KEYWORDS,
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   314
	 "list a directory\n"},
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   315
	{NULL, NULL}
5396
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
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   318
PyMODINIT_FUNC initosutil(void)
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   319
{
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   320
	if (PyType_Ready(&listdir_stat_type) == -1)
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   321
		return;
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   322
5421
9b5d626be8ba osutil: cleanups
Matt Mackall <mpm@selenic.com>
parents: 5416
diff changeset
   323
	Py_InitModule3("osutil", methods, osutil_doc);
5396
5105b119edd2 Add osutil module, containing a listdir function.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   324
}