#endif
#ifdef BUP_HAVE_READLINE
-#include <readline/readline.h>
-#include <readline/history.h>
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wstrict-prototypes"
+# ifdef BUP_READLINE_INCLUDES_IN_SUBDIR
+# include <readline/readline.h>
+# include <readline/history.h>
+# else
+# include <readline.h>
+# include <history.h>
+# endif
+# pragma GCC diagnostic pop
#endif
#include "bupsplit.h"
({ \
_Pragma("GCC diagnostic push"); \
_Pragma("GCC diagnostic ignored \"-Wsign-compare\""); \
+ _Pragma("clang diagnostic push"); \
+ _Pragma("clang diagnostic ignored \"-Wshorten-64-to-32\""); \
*(dest) = (src); \
int result = *(dest) == (src) && (*(dest) < 1) == ((src) < 1); \
+ _Pragma("clang diagnostic pop"); \
_Pragma("GCC diagnostic pop"); \
result; \
})
PyErr_Format(PyExc_OverflowError, "%s too big for unsigned int", name);
return 0;
}
- *x = tmp;
+ *x = (unsigned int) tmp;
return 1;
}
if (!PyArg_ParseTuple(args, "t#", &buf, &len))
return NULL;
assert(len <= INT_MAX);
- out = bupsplit_find_ofs(buf, len, &bits);
+ out = bupsplit_find_ofs(buf, (int) len, &bits);
}
if (out) assert(bits >= BUP_BLOBBITS);
return Py_BuildValue("ii", out, bits);
static void _fix_idx_order(struct idx **idxs, Py_ssize_t *last_i)
{
struct idx *idx;
- int low, mid, high, c = 0;
+ Py_ssize_t low, mid, high;
+ int c = 0;
idx = idxs[*last_i];
if (idxs[*last_i]->cur >= idxs[*last_i]->end)
ofs64_count = 0;
for (i = 0; i < FAN_ENTRIES; ++i)
{
- int plen;
+ Py_ssize_t plen;
part = PyList_GET_ITEM(idx, i);
PyList_Sort(part);
plen = PyList_GET_SIZE(part);
- count += plen;
+ if (plen > UINT32_MAX || UINT32_MAX - count < plen) {
+ PyErr_Format(PyExc_OverflowError, "too many objects in index part");
+ goto clean_and_return;
+ }
+ count += (uint32_t) plen;
*fan_ptr++ = htonl(count);
- for (j = 0; j < plen; ++j)
+ for (j = 0; j < plen; ++j)
{
unsigned char *sha = NULL;
Py_ssize_t sha_len = 0;
{
unsigned i;
for (i = 0; i < sizeof(buf)/sizeof(buf[0]); i++)
- buf[i] = random();
+ buf[i] = (uint32_t) random();
ret = write(fd, buf, sizeof(buf));
if (ret < 0)
ret = 0;
{
unsigned i;
for (i = 0; i < sizeof(buf)/sizeof(buf[0]); i++)
- buf[i] = random();
+ buf[i] = (uint32_t) random();
ret = write(fd, buf, len % 1024);
if (ret < 0)
ret = 0;
if (!seeded)
{
assert(sizeof(shabuf) == 20);
- srandom(time(NULL));
+ srandom((unsigned int) time(NULL));
seeded = 1;
}
memset(shabuf, 0, sizeof(shabuf));
for (i=0; i < 20/4; i++)
- shabuf[i] = random();
+ shabuf[i] = (uint32_t) random();
return Py_BuildValue(rbuf_argf, shabuf, 20);
}
return result;
}
+static PyObject *appropriate_errno_ex(void)
+{
+ switch (errno) {
+ case ENOMEM:
+ return PyErr_NoMemory();
+ case EIO:
+ case EMFILE:
+ case ENFILE:
+ // In 3.3 IOError was merged into OSError.
+ return PyErr_SetFromErrno(PyExc_IOError);
+ default:
+ return PyErr_SetFromErrno(PyExc_OSError);
+ }
+}
-static long getpw_buf_size;
-static PyObject *pwd_struct_to_py(const struct passwd *pwd, int rc)
+static PyObject *pwd_struct_to_py(const struct passwd *pwd)
{
// We can check the known (via POSIX) signed and unsigned types at
// compile time, but not (easily) the unspecified types, so handle
// those via INTEGER_TO_PY().
- if (pwd != NULL)
- return Py_BuildValue(cstr_argf cstr_argf "OO"
- cstr_argf cstr_argf cstr_argf,
- pwd->pw_name,
- pwd->pw_passwd,
- INTEGER_TO_PY(pwd->pw_uid),
- INTEGER_TO_PY(pwd->pw_gid),
- pwd->pw_gecos,
- pwd->pw_dir,
- pwd->pw_shell);
- if (rc == 0)
- return Py_BuildValue("O", Py_None);
- if (rc == EIO || rc == EMFILE || rc == ENFILE)
- return PyErr_SetFromErrno(PyExc_IOError);
- if (rc < 0)
- return PyErr_SetFromErrno(PyExc_OSError);
- assert(0);
+ if (pwd == NULL)
+ Py_RETURN_NONE;
+ return Py_BuildValue(cstr_argf cstr_argf "OO"
+ cstr_argf cstr_argf cstr_argf,
+ pwd->pw_name,
+ pwd->pw_passwd,
+ INTEGER_TO_PY(pwd->pw_uid),
+ INTEGER_TO_PY(pwd->pw_gid),
+ pwd->pw_gecos,
+ pwd->pw_dir,
+ pwd->pw_shell);
}
static PyObject *bup_getpwuid(PyObject *self, PyObject *args)
{
- unsigned long uid;
- if (!PyArg_ParseTuple(args, "k", &uid))
+ unsigned long long py_uid;
+ if (!PyArg_ParseTuple(args, "K", &py_uid))
return NULL;
+ uid_t uid;
+ if (!INTEGRAL_ASSIGNMENT_FITS(&uid, py_uid))
+ return PyErr_Format(PyExc_OverflowError, "uid too large for uid_t");
- struct passwd pwd, *result_pwd;
- char *buf = PyMem_Malloc(getpw_buf_size);
- if (buf == NULL)
- return NULL;
-
- int rc = getpwuid_r(uid, &pwd, buf, getpw_buf_size, &result_pwd);
- PyObject *result = pwd_struct_to_py(result_pwd, rc);
- PyMem_Free(buf);
- return result;
+ errno = 0;
+ struct passwd *pwd = getpwuid(uid);
+ if (!pwd && errno)
+ return appropriate_errno_ex();
+ return pwd_struct_to_py(pwd);
}
static PyObject *bup_getpwnam(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "S", &py_name))
return NULL;
- struct passwd pwd, *result_pwd;
- char *buf = PyMem_Malloc(getpw_buf_size);
- if (buf == NULL)
- return NULL;
-
char *name = PyBytes_AS_STRING(py_name);
- int rc = getpwnam_r(name, &pwd, buf, getpw_buf_size, &result_pwd);
- PyObject *result = pwd_struct_to_py(result_pwd, rc);
- PyMem_Free(buf);
- return result;
+ errno = 0;
+ struct passwd *pwd = getpwnam(name);
+ if (!pwd && errno)
+ return appropriate_errno_ex();
+ return pwd_struct_to_py(pwd);
}
-static long getgr_buf_size;
-
-static PyObject *grp_struct_to_py(const struct group *grp, int rc)
+static PyObject *grp_struct_to_py(const struct group *grp)
{
// We can check the known (via POSIX) signed and unsigned types at
// compile time, but not (easily) the unspecified types, so handle
// those via INTEGER_TO_PY().
- if (grp != NULL) {
- PyObject *members = tuple_from_cstrs(grp->gr_mem);
- if (members == NULL)
- return NULL;
- return Py_BuildValue(cstr_argf cstr_argf "OO",
- grp->gr_name,
- grp->gr_passwd,
- INTEGER_TO_PY(grp->gr_gid),
- members);
- }
- if (rc == 0)
- return Py_BuildValue("O", Py_None);
- errno = rc;
- if (rc == EIO || rc == EMFILE || rc == ENFILE)
- return PyErr_SetFromErrno(PyExc_IOError);
- return PyErr_SetFromErrno(PyExc_OSError);
+ if (grp == NULL)
+ Py_RETURN_NONE;
+
+ PyObject *members = tuple_from_cstrs(grp->gr_mem);
+ if (members == NULL)
+ return NULL;
+ return Py_BuildValue(cstr_argf cstr_argf "OO",
+ grp->gr_name,
+ grp->gr_passwd,
+ INTEGER_TO_PY(grp->gr_gid),
+ members);
}
static PyObject *bup_getgrgid(PyObject *self, PyObject *args)
{
- unsigned long gid;
- if (!PyArg_ParseTuple(args, "k", &gid))
+ unsigned long long py_gid;
+ if (!PyArg_ParseTuple(args, "K", &py_gid))
return NULL;
+ gid_t gid;
+ if (!INTEGRAL_ASSIGNMENT_FITS(&gid, py_gid))
+ return PyErr_Format(PyExc_OverflowError, "gid too large for gid_t");
- struct group grp, *result_grp;
- char *buf = PyMem_Malloc(getgr_buf_size);
- if (buf == NULL)
- return NULL;
-
- int rc = getgrgid_r(gid, &grp, buf, getgr_buf_size, &result_grp);
- PyObject *result = grp_struct_to_py(result_grp, rc);
- PyMem_Free(buf);
- return result;
+ errno = 0;
+ struct group *grp = getgrgid(gid);
+ if (!grp && errno)
+ return appropriate_errno_ex();
+ return grp_struct_to_py(grp);
}
static PyObject *bup_getgrnam(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "S", &py_name))
return NULL;
- struct group grp, *result_grp;
- char *buf = PyMem_Malloc(getgr_buf_size);
- if (buf == NULL)
- return NULL;
-
char *name = PyBytes_AS_STRING(py_name);
- int rc = getgrnam_r(name, &grp, buf, getgr_buf_size, &result_grp);
- PyObject *result = grp_struct_to_py(result_grp, rc);
- PyMem_Free(buf);
- return result;
+ errno = 0;
+ struct group *grp = getgrnam(name);
+ if (!grp && errno)
+ return appropriate_errno_ex();
+ return grp_struct_to_py(grp);
}
+
static PyObject *bup_gethostname(PyObject *mod, PyObject *ignore)
{
#ifdef HOST_NAME_MAX
#endif
#pragma clang diagnostic pop // ignored "-Wtautological-compare"
- getpw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);
- if (getpw_buf_size == -1)
- getpw_buf_size = 16384;
-
- getgr_buf_size = sysconf(_SC_GETGR_R_SIZE_MAX);
- if (getgr_buf_size == -1)
- getgr_buf_size = 16384;
-
e = getenv("BUP_FORCE_TTY");
get_state(m)->istty2 = isatty(2) || (atoi(e ? e : "0") & 2);
unpythonize_argv();
projects / bup.git / blobdiff