traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changes for long file support by Steve Clift.

This commit is contained in:
Guido van Rossum 1999-01-06 18:44:57 +00:00
parent 056bad993c
commit 763737be52
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Modules/resource.c
View File

@ -120,7 +120,15 @@ resource_getrlimit(self, args)
PyErr_SetFromErrno(ResourceError); PyErr_SetFromErrno(ResourceError);
return NULL; return NULL;
} }
return Py_BuildValue("ii", rl.rlim_cur, rl.rlim_max);
#if defined(HAVE_LONG_LONG)
if (sizeof(rl.rlim_cur) > sizeof(long)) {
return Py_BuildValue("LL",
(LONG_LONG) rl.rlim_cur,
(LONG_LONG) rl.rlim_max);
}
#endif
return Py_BuildValue("ii", (long) rl.rlim_cur, (long) rl.rlim_max);
} }
static PyObject * static PyObject *
@ -130,9 +138,9 @@ resource_setrlimit(self, args)
{ {
struct rlimit rl; struct rlimit rl;
int resource; int resource;
PyObject *curobj, *maxobj;
if (!PyArg_ParseTuple(args, "i(ii)", &resource, &rl.rlim_cur, if (!PyArg_ParseTuple(args, "i(OO)", &resource, &curobj, &maxobj))
&rl.rlim_max))
return NULL; return NULL;
if (resource < 0 || resource >= RLIM_NLIMITS) { if (resource < 0 || resource >= RLIM_NLIMITS) {
@ -141,6 +149,17 @@ resource_setrlimit(self, args)
return NULL; return NULL;
} }
#if !defined(HAVE_LARGEFILE_SUPPORT)
rl.rlim_cur = PyInt_AsLong(curobj);
rl.rlim_max = PyInt_AsLong(maxobj);
#else
/* The limits are probably bigger than a long */
rl.rlim_cur = PyLong_Check(curobj) ?
PyLong_AsLongLong(curobj) : PyInt_AsLong(curobj);
rl.rlim_max = PyLong_Check(maxobj) ?
PyLong_AsLongLong(maxobj) : PyInt_AsLong(maxobj);
#endif
rl.rlim_cur = rl.rlim_cur & RLIM_INFINITY; rl.rlim_cur = rl.rlim_cur & RLIM_INFINITY;
rl.rlim_max = rl.rlim_max & RLIM_INFINITY; rl.rlim_max = rl.rlim_max & RLIM_INFINITY;
if (setrlimit(resource, &rl) == -1) { if (setrlimit(resource, &rl) == -1) {