mirror of
https://github.com/python/cpython.git
synced 2025-11-03 03:22:27 +00:00
Recorded merge of revisions 81032 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r81032 | antoine.pitrou | 2010-05-09 17:52:27 +0200 (dim., 09 mai 2010) | 9 lines
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
................
This commit is contained in:
Antoine Pitrou
parent
b7d943625c
commit
7f14f0d8a0
251 changed files with 111553 additions and 111553 deletions
|
|
@ -8,14 +8,14 @@
|
|||
#include <pwd.h>
|
||||
|
||||
static PyStructSequence_Field struct_pwd_type_fields[] = {
|
||||
{"pw_name", "user name"},
|
||||
{"pw_passwd", "password"},
|
||||
{"pw_uid", "user id"},
|
||||
{"pw_gid", "group id"},
|
||||
{"pw_gecos", "real name"},
|
||||
{"pw_dir", "home directory"},
|
||||
{"pw_shell", "shell program"},
|
||||
{0}
|
||||
{"pw_name", "user name"},
|
||||
{"pw_passwd", "password"},
|
||||
{"pw_uid", "user id"},
|
||||
{"pw_gid", "group id"},
|
||||
{"pw_gecos", "real name"},
|
||||
{"pw_dir", "home directory"},
|
||||
{"pw_shell", "shell program"},
|
||||
{0}
|
||||
};
|
||||
|
||||
PyDoc_STRVAR(struct_passwd__doc__,
|
||||
|
|
@ -25,10 +25,10 @@ This object may be accessed either as a tuple of\n\
|
|||
or via the object attributes as named in the above tuple.");
|
||||
|
||||
static PyStructSequence_Desc struct_pwd_type_desc = {
|
||||
"pwd.struct_passwd",
|
||||
struct_passwd__doc__,
|
||||
struct_pwd_type_fields,
|
||||
7,
|
||||
"pwd.struct_passwd",
|
||||
struct_passwd__doc__,
|
||||
struct_pwd_type_fields,
|
||||
7,
|
||||
};
|
||||
|
||||
PyDoc_STRVAR(pwd__doc__,
|
||||
|
|
@ -41,7 +41,7 @@ pw_name, pw_passwd, pw_uid, pw_gid, pw_gecos, pw_dir, pw_shell.\n\
|
|||
The uid and gid items are integers, all others are strings. An\n\
|
||||
exception is raised if the entry asked for cannot be found.");
|
||||
|
||||
|
||||
|
||||
static int initialized;
|
||||
static PyTypeObject StructPwdType;
|
||||
|
||||
|
|
@ -49,53 +49,53 @@ static void
|
|||
sets(PyObject *v, int i, const char* val)
|
||||
{
|
||||
if (val) {
|
||||
PyObject *o = PyUnicode_Decode(val, strlen(val),
|
||||
Py_FileSystemDefaultEncoding,
|
||||
"surrogateescape");
|
||||
PyStructSequence_SET_ITEM(v, i, o);
|
||||
PyObject *o = PyUnicode_Decode(val, strlen(val),
|
||||
Py_FileSystemDefaultEncoding,
|
||||
"surrogateescape");
|
||||
PyStructSequence_SET_ITEM(v, i, o);
|
||||
}
|
||||
else {
|
||||
PyStructSequence_SET_ITEM(v, i, Py_None);
|
||||
Py_INCREF(Py_None);
|
||||
PyStructSequence_SET_ITEM(v, i, Py_None);
|
||||
Py_INCREF(Py_None);
|
||||
}
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
mkpwent(struct passwd *p)
|
||||
{
|
||||
int setIndex = 0;
|
||||
PyObject *v = PyStructSequence_New(&StructPwdType);
|
||||
if (v == NULL)
|
||||
return NULL;
|
||||
int setIndex = 0;
|
||||
PyObject *v = PyStructSequence_New(&StructPwdType);
|
||||
if (v == NULL)
|
||||
return NULL;
|
||||
|
||||
#define SETI(i,val) PyStructSequence_SET_ITEM(v, i, PyLong_FromLong((long) val))
|
||||
#define SETS(i,val) sets(v, i, val)
|
||||
|
||||
SETS(setIndex++, p->pw_name);
|
||||
SETS(setIndex++, p->pw_name);
|
||||
#ifdef __VMS
|
||||
SETS(setIndex++, "");
|
||||
SETS(setIndex++, "");
|
||||
#else
|
||||
SETS(setIndex++, p->pw_passwd);
|
||||
SETS(setIndex++, p->pw_passwd);
|
||||
#endif
|
||||
SETI(setIndex++, p->pw_uid);
|
||||
SETI(setIndex++, p->pw_gid);
|
||||
SETI(setIndex++, p->pw_uid);
|
||||
SETI(setIndex++, p->pw_gid);
|
||||
#ifdef __VMS
|
||||
SETS(setIndex++, "");
|
||||
SETS(setIndex++, "");
|
||||
#else
|
||||
SETS(setIndex++, p->pw_gecos);
|
||||
SETS(setIndex++, p->pw_gecos);
|
||||
#endif
|
||||
SETS(setIndex++, p->pw_dir);
|
||||
SETS(setIndex++, p->pw_shell);
|
||||
SETS(setIndex++, p->pw_dir);
|
||||
SETS(setIndex++, p->pw_shell);
|
||||
|
||||
#undef SETS
|
||||
#undef SETI
|
||||
|
||||
if (PyErr_Occurred()) {
|
||||
Py_XDECREF(v);
|
||||
return NULL;
|
||||
}
|
||||
if (PyErr_Occurred()) {
|
||||
Py_XDECREF(v);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return v;
|
||||
return v;
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(pwd_getpwuid__doc__,
|
||||
|
|
@ -107,16 +107,16 @@ See pwd.__doc__ for more on password database entries.");
|
|||
static PyObject *
|
||||
pwd_getpwuid(PyObject *self, PyObject *args)
|
||||
{
|
||||
unsigned int uid;
|
||||
struct passwd *p;
|
||||
if (!PyArg_ParseTuple(args, "I:getpwuid", &uid))
|
||||
return NULL;
|
||||
if ((p = getpwuid(uid)) == NULL) {
|
||||
PyErr_Format(PyExc_KeyError,
|
||||
"getpwuid(): uid not found: %d", uid);
|
||||
return NULL;
|
||||
}
|
||||
return mkpwent(p);
|
||||
unsigned int uid;
|
||||
struct passwd *p;
|
||||
if (!PyArg_ParseTuple(args, "I:getpwuid", &uid))
|
||||
return NULL;
|
||||
if ((p = getpwuid(uid)) == NULL) {
|
||||
PyErr_Format(PyExc_KeyError,
|
||||
"getpwuid(): uid not found: %d", uid);
|
||||
return NULL;
|
||||
}
|
||||
return mkpwent(p);
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(pwd_getpwnam__doc__,
|
||||
|
|
@ -128,27 +128,27 @@ See pwd.__doc__ for more on password database entries.");
|
|||
static PyObject *
|
||||
pwd_getpwnam(PyObject *self, PyObject *args)
|
||||
{
|
||||
char *name;
|
||||
struct passwd *p;
|
||||
PyObject *arg, *bytes, *retval = NULL;
|
||||
char *name;
|
||||
struct passwd *p;
|
||||
PyObject *arg, *bytes, *retval = NULL;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "U:getpwnam", &arg))
|
||||
return NULL;
|
||||
if ((bytes = PyUnicode_AsEncodedString(arg,
|
||||
Py_FileSystemDefaultEncoding,
|
||||
"surrogateescape")) == NULL)
|
||||
return NULL;
|
||||
if (PyBytes_AsStringAndSize(bytes, &name, NULL) == -1)
|
||||
goto out;
|
||||
if ((p = getpwnam(name)) == NULL) {
|
||||
PyErr_Format(PyExc_KeyError,
|
||||
"getpwnam(): name not found: %s", name);
|
||||
goto out;
|
||||
}
|
||||
retval = mkpwent(p);
|
||||
if (!PyArg_ParseTuple(args, "U:getpwnam", &arg))
|
||||
return NULL;
|
||||
if ((bytes = PyUnicode_AsEncodedString(arg,
|
||||
Py_FileSystemDefaultEncoding,
|
||||
"surrogateescape")) == NULL)
|
||||
return NULL;
|
||||
if (PyBytes_AsStringAndSize(bytes, &name, NULL) == -1)
|
||||
goto out;
|
||||
if ((p = getpwnam(name)) == NULL) {
|
||||
PyErr_Format(PyExc_KeyError,
|
||||
"getpwnam(): name not found: %s", name);
|
||||
goto out;
|
||||
}
|
||||
retval = mkpwent(p);
|
||||
out:
|
||||
Py_DECREF(bytes);
|
||||
return retval;
|
||||
Py_DECREF(bytes);
|
||||
return retval;
|
||||
}
|
||||
|
||||
#ifdef HAVE_GETPWENT
|
||||
|
|
@ -161,67 +161,67 @@ See pwd.__doc__ for more on password database entries.");
|
|||
static PyObject *
|
||||
pwd_getpwall(PyObject *self)
|
||||
{
|
||||
PyObject *d;
|
||||
struct passwd *p;
|
||||
if ((d = PyList_New(0)) == NULL)
|
||||
return NULL;
|
||||
PyObject *d;
|
||||
struct passwd *p;
|
||||
if ((d = PyList_New(0)) == NULL)
|
||||
return NULL;
|
||||
#if defined(PYOS_OS2) && defined(PYCC_GCC)
|
||||
if ((p = getpwuid(0)) != NULL) {
|
||||
if ((p = getpwuid(0)) != NULL) {
|
||||
#else
|
||||
setpwent();
|
||||
while ((p = getpwent()) != NULL) {
|
||||
setpwent();
|
||||
while ((p = getpwent()) != NULL) {
|
||||
#endif
|
||||
PyObject *v = mkpwent(p);
|
||||
if (v == NULL || PyList_Append(d, v) != 0) {
|
||||
Py_XDECREF(v);
|
||||
Py_DECREF(d);
|
||||
endpwent();
|
||||
return NULL;
|
||||
}
|
||||
Py_DECREF(v);
|
||||
}
|
||||
endpwent();
|
||||
return d;
|
||||
PyObject *v = mkpwent(p);
|
||||
if (v == NULL || PyList_Append(d, v) != 0) {
|
||||
Py_XDECREF(v);
|
||||
Py_DECREF(d);
|
||||
endpwent();
|
||||
return NULL;
|
||||
}
|
||||
Py_DECREF(v);
|
||||
}
|
||||
endpwent();
|
||||
return d;
|
||||
}
|
||||
#endif
|
||||
|
||||
static PyMethodDef pwd_methods[] = {
|
||||
{"getpwuid", pwd_getpwuid, METH_VARARGS, pwd_getpwuid__doc__},
|
||||
{"getpwnam", pwd_getpwnam, METH_VARARGS, pwd_getpwnam__doc__},
|
||||
{"getpwuid", pwd_getpwuid, METH_VARARGS, pwd_getpwuid__doc__},
|
||||
{"getpwnam", pwd_getpwnam, METH_VARARGS, pwd_getpwnam__doc__},
|
||||
#ifdef HAVE_GETPWENT
|
||||
{"getpwall", (PyCFunction)pwd_getpwall,
|
||||
METH_NOARGS, pwd_getpwall__doc__},
|
||||
{"getpwall", (PyCFunction)pwd_getpwall,
|
||||
METH_NOARGS, pwd_getpwall__doc__},
|
||||
#endif
|
||||
{NULL, NULL} /* sentinel */
|
||||
{NULL, NULL} /* sentinel */
|
||||
};
|
||||
|
||||
static struct PyModuleDef pwdmodule = {
|
||||
PyModuleDef_HEAD_INIT,
|
||||
"pwd",
|
||||
pwd__doc__,
|
||||
-1,
|
||||
pwd_methods,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
PyModuleDef_HEAD_INIT,
|
||||
"pwd",
|
||||
pwd__doc__,
|
||||
-1,
|
||||
pwd_methods,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
PyMODINIT_FUNC
|
||||
PyInit_pwd(void)
|
||||
{
|
||||
PyObject *m;
|
||||
m = PyModule_Create(&pwdmodule);
|
||||
if (m == NULL)
|
||||
return NULL;
|
||||
PyObject *m;
|
||||
m = PyModule_Create(&pwdmodule);
|
||||
if (m == NULL)
|
||||
return NULL;
|
||||
|
||||
if (!initialized) {
|
||||
PyStructSequence_InitType(&StructPwdType,
|
||||
&struct_pwd_type_desc);
|
||||
initialized = 1;
|
||||
}
|
||||
Py_INCREF((PyObject *) &StructPwdType);
|
||||
PyModule_AddObject(m, "struct_passwd", (PyObject *) &StructPwdType);
|
||||
return m;
|
||||
if (!initialized) {
|
||||
PyStructSequence_InitType(&StructPwdType,
|
||||
&struct_pwd_type_desc);
|
||||
initialized = 1;
|
||||
}
|
||||
Py_INCREF((PyObject *) &StructPwdType);
|
||||
PyModule_AddObject(m, "struct_passwd", (PyObject *) &StructPwdType);
|
||||
return m;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue