X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=blobdiff_plain;f=lib%2Fbup%2F_helpers.c;h=489bd14768884ad346693266b80792f7aa53151f;hp=aadcbe4e149cd4a8584365def0d0d5dbb753839f;hb=ba836360f66ed046be1af98904a36a4ce862ca62;hpb=d8684a29a3346bf34dbcf61f33deb5cebf2a85db diff --git a/lib/bup/_helpers.c b/lib/bup/_helpers.c index aadcbe4..489bd14 100644 --- a/lib/bup/_helpers.c +++ b/lib/bup/_helpers.c @@ -7,10 +7,12 @@ // http://docs.python.org/2/c-api/intro.html#include-files #include +#include #include #include #include -#include +#include +#include #include #include #include @@ -44,6 +46,24 @@ #include #endif +#if defined(BUP_RL_EXPECTED_XOPEN_SOURCE) \ + && (!defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < BUP_RL_EXPECTED_XOPEN_SOURCE) +# warning "_XOPEN_SOURCE version is incorrect for readline" +#endif + +#ifdef BUP_HAVE_READLINE +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wstrict-prototypes" +# ifdef BUP_READLINE_INCLUDES_IN_SUBDIR +# include +# include +# else +# include +# include +# endif +# pragma GCC diagnostic pop +#endif + #include "bupsplit.h" #if defined(FS_IOC_GETFLAGS) && defined(FS_IOC_SETFLAGS) @@ -89,6 +109,39 @@ static state_t state; #endif // PY_MAJOR_VERSION >= 3 +static void *checked_calloc(size_t n, size_t size) +{ + void *result = calloc(n, size); + if (!result) + PyErr_NoMemory(); + return result; +} + +#ifndef BUP_HAVE_BUILTIN_MUL_OVERFLOW + +#define checked_malloc checked_calloc + +#else // defined BUP_HAVE_BUILTIN_MUL_OVERFLOW + +static void *checked_malloc(size_t n, size_t size) +{ + size_t total; + if (__builtin_mul_overflow(n, size, &total)) + { + PyErr_Format(PyExc_OverflowError, + "request to allocate %lu items of size %lu is too large", + n, size); + return NULL; + } + void *result = malloc(total); + if (!result) + return PyErr_NoMemory(); + return result; +} + +#endif // defined BUP_HAVE_BUILTIN_MUL_OVERFLOW + + #ifndef htonll // This function should technically be macro'd out if it's going to be used // more than ocasionally. As of this writing, it'll actually never be called @@ -104,13 +157,6 @@ static uint64_t htonll(uint64_t value) #endif -#ifdef __clang__ -#define INTEGRAL_ASSIGNMENT_FITS(dest, src) \ - ({ \ - *(dest) = (src); \ - *(dest) == (src) && (*(dest) < 1) == ((src) < 1); \ - }) -#else // Disabling sign-compare here should be fine since we're explicitly // checking for a sign mismatch, i.e. if the signs don't match, then // it doesn't matter what the value comparison says. @@ -119,11 +165,14 @@ static uint64_t htonll(uint64_t value) ({ \ _Pragma("GCC diagnostic push"); \ _Pragma("GCC diagnostic ignored \"-Wsign-compare\""); \ + _Pragma("clang diagnostic push"); \ + _Pragma("clang diagnostic ignored \"-Wshorten-64-to-32\""); \ *(dest) = (src); \ - *(dest) == (src) && (*(dest) < 1) == ((src) < 1); \ + int result = *(dest) == (src) && (*(dest) < 1) == ((src) < 1); \ + _Pragma("clang diagnostic pop"); \ _Pragma("GCC diagnostic pop"); \ + result; \ }) -#endif // At the moment any code that calls INTEGER_TO_PY() will have to @@ -195,7 +244,7 @@ static int bup_uint_from_py(unsigned int *x, PyObject *py, const char *name) PyErr_Format(PyExc_OverflowError, "%s too big for unsigned int", name); return 0; } - *x = tmp; + *x = (unsigned int) tmp; return 1; } @@ -255,6 +304,49 @@ static PyObject *bup_bytescmp(PyObject *self, PyObject *args) } +static PyObject *bup_cat_bytes(PyObject *self, PyObject *args) +{ + unsigned char *bufx = NULL, *bufy = NULL; + Py_ssize_t bufx_len, bufx_ofs, bufx_n; + Py_ssize_t bufy_len, bufy_ofs, bufy_n; + if (!PyArg_ParseTuple(args, + rbuf_argf "nn" + rbuf_argf "nn", + &bufx, &bufx_len, &bufx_ofs, &bufx_n, + &bufy, &bufy_len, &bufy_ofs, &bufy_n)) + return NULL; + if (bufx_ofs < 0) + return PyErr_Format(PyExc_ValueError, "negative x offset"); + if (bufx_n < 0) + return PyErr_Format(PyExc_ValueError, "negative x extent"); + if (bufx_ofs > bufx_len) + return PyErr_Format(PyExc_ValueError, "x offset greater than length"); + if (bufx_n > bufx_len - bufx_ofs) + return PyErr_Format(PyExc_ValueError, "x extent past end of buffer"); + + if (bufy_ofs < 0) + return PyErr_Format(PyExc_ValueError, "negative y offset"); + if (bufy_n < 0) + return PyErr_Format(PyExc_ValueError, "negative y extent"); + if (bufy_ofs > bufy_len) + return PyErr_Format(PyExc_ValueError, "y offset greater than length"); + if (bufy_n > bufy_len - bufy_ofs) + return PyErr_Format(PyExc_ValueError, "y extent past end of buffer"); + + if (bufy_n > PY_SSIZE_T_MAX - bufx_n) + return PyErr_Format(PyExc_OverflowError, "result length too long"); + + PyObject *result = PyBytes_FromStringAndSize(NULL, bufx_n + bufy_n); + if (!result) + return PyErr_NoMemory(); + char *buf = PyBytes_AS_STRING(result); + memcpy(buf, bufx + bufx_ofs, bufx_n); + memcpy(buf + bufx_n, bufy + bufy_ofs, bufy_n); + return result; +} + + + // Probably we should use autoconf or something and set HAVE_PY_GETARGCARGV... #if __WIN32__ || __CYGWIN__ @@ -472,7 +564,7 @@ static PyObject *bup_write_sparsely(PyObject *self, PyObject *args) unsigned char *buf = NULL; Py_ssize_t sbuf_len; PyObject *py_min_sparse_len, *py_prev_sparse_len; - if (!PyArg_ParseTuple(args, "it#OO", + if (!PyArg_ParseTuple(args, "i" rbuf_argf "OO", &fd, &buf, &sbuf_len, &py_min_sparse_len, &py_prev_sparse_len)) return NULL; @@ -576,7 +668,7 @@ static PyObject *splitbuf(PyObject *self, PyObject *args) 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); @@ -590,7 +682,7 @@ static PyObject *bitmatch(PyObject *self, PyObject *args) Py_ssize_t byte; int bit; - if (!PyArg_ParseTuple(args, "t#t#", &buf1, &len1, &buf2, &len2)) + if (!PyArg_ParseTuple(args, rbuf_argf rbuf_argf, &buf1, &len1, &buf2, &len2)) return NULL; bit = 0; @@ -617,7 +709,7 @@ static PyObject *firstword(PyObject *self, PyObject *args) Py_ssize_t len = 0; uint32_t v; - if (!PyArg_ParseTuple(args, "t#", &buf, &len)) + if (!PyArg_ParseTuple(args, rbuf_argf, &buf, &len)) return NULL; if (len < 4) @@ -795,7 +887,7 @@ static PyObject *extract_bits(PyObject *self, PyObject *args) Py_ssize_t len = 0; int nbits = 0; - if (!PyArg_ParseTuple(args, "t#i", &buf, &len, &nbits)) + if (!PyArg_ParseTuple(args, rbuf_argf "i", &buf, &len, &nbits)) return NULL; if (len < 4) @@ -824,10 +916,11 @@ struct idx { int name_base; }; -static void _fix_idx_order(struct idx **idxs, int *last_i) +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) @@ -874,36 +967,51 @@ static uint32_t _get_idx_i(struct idx *idx) static PyObject *merge_into(PyObject *self, PyObject *args) { - PyObject *py_total, *ilist = NULL; - unsigned char *fmap = NULL; struct sha *sha_ptr, *sha_start = NULL; uint32_t *table_ptr, *name_ptr, *name_start; - struct idx **idxs = NULL; - Py_ssize_t flen = 0; - int bits = 0, i; + int i; unsigned int total; uint32_t count, prefix; - int num_i; - int last_i; - if (!PyArg_ParseTuple(args, "w#iOO", - &fmap, &flen, &bits, &py_total, &ilist)) + + Py_buffer fmap; + int bits;; + PyObject *py_total, *ilist = NULL; + if (!PyArg_ParseTuple(args, wbuf_argf "iOO", + &fmap, &bits, &py_total, &ilist)) return NULL; + PyObject *result = NULL; + struct idx **idxs = NULL; + Py_ssize_t num_i = 0; + int *idx_buf_init = NULL; + Py_buffer *idx_buf = NULL; + if (!bup_uint_from_py(&total, py_total, "total")) - return NULL; + goto clean_and_return; num_i = PyList_Size(ilist); - idxs = (struct idx **)PyMem_Malloc(num_i * sizeof(struct idx *)); + + if (!(idxs = checked_malloc(num_i, sizeof(struct idx *)))) + goto clean_and_return; + if (!(idx_buf_init = checked_calloc(num_i, sizeof(int)))) + goto clean_and_return; + if (!(idx_buf = checked_malloc(num_i, sizeof(Py_buffer)))) + goto clean_and_return; for (i = 0; i < num_i; i++) { long len, sha_ofs, name_map_ofs; - idxs[i] = (struct idx *)PyMem_Malloc(sizeof(struct idx)); + if (!(idxs[i] = checked_malloc(1, sizeof(struct idx)))) + goto clean_and_return; PyObject *itup = PyList_GetItem(ilist, i); - if (!PyArg_ParseTuple(itup, "t#llli", &idxs[i]->map, &idxs[i]->bytes, - &len, &sha_ofs, &name_map_ofs, &idxs[i]->name_base)) + if (!PyArg_ParseTuple(itup, wbuf_argf "llli", + &(idx_buf[i]), &len, &sha_ofs, &name_map_ofs, + &idxs[i]->name_base)) return NULL; + idx_buf_init[i] = 1; + idxs[i]->map = idx_buf[i].buf; + idxs[i]->bytes = idx_buf[i].len; idxs[i]->cur = (struct sha *)&idxs[i]->map[sha_ofs]; idxs[i]->end = &idxs[i]->cur[len]; if (name_map_ofs) @@ -911,11 +1019,11 @@ static PyObject *merge_into(PyObject *self, PyObject *args) else idxs[i]->cur_name = NULL; } - table_ptr = (uint32_t *)&fmap[MIDX4_HEADERLEN]; + table_ptr = (uint32_t *) &((unsigned char *) fmap.buf)[MIDX4_HEADERLEN]; sha_start = sha_ptr = (struct sha *)&table_ptr[1<= 0) @@ -944,8 +1052,25 @@ static PyObject *merge_into(PyObject *self, PyObject *args) assert(sha_ptr == sha_start+count); assert(name_ptr == name_start+count); - PyMem_Free(idxs); - return PyLong_FromUnsignedLong(count); + result = PyLong_FromUnsignedLong(count); + + clean_and_return: + if (idx_buf_init) + { + for (i = 0; i < num_i; i++) + if (idx_buf_init[i]) + PyBuffer_Release(&(idx_buf[i])); + free(idx_buf_init); + free(idx_buf); + } + if (idxs) + { + for (i = 0; i < num_i; i++) + free(idxs[i]); + free(idxs); + } + PyBuffer_Release(&fmap); + return result; } #define FAN_ENTRIES 256 @@ -992,13 +1117,17 @@ static PyObject *write_idx(PyObject *self, PyObject *args) 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; @@ -1066,7 +1195,7 @@ static PyObject *write_random(PyObject *self, PyObject *args) { 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; @@ -1082,7 +1211,7 @@ static PyObject *write_random(PyObject *self, PyObject *args) { 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; @@ -1104,7 +1233,7 @@ static PyObject *random_sha(PyObject *self, PyObject *args) if (!seeded) { assert(sizeof(shabuf) == 20); - srandom(time(NULL)); + srandom((unsigned int) time(NULL)); seeded = 1; } @@ -1113,8 +1242,8 @@ static PyObject *random_sha(PyObject *self, PyObject *args) memset(shabuf, 0, sizeof(shabuf)); for (i=0; i < 20/4; i++) - shabuf[i] = random(); - return Py_BuildValue("s#", shabuf, 20); + shabuf[i] = (uint32_t) random(); + return Py_BuildValue(rbuf_argf, shabuf, 20); } @@ -1229,7 +1358,7 @@ static PyObject *bup_set_linux_file_attr(PyObject *self, PyObject *args) PyObject *py_attr; int fd; - if (!PyArg_ParseTuple(args, "sO", &path, &py_attr)) + if (!PyArg_ParseTuple(args, cstr_argf "O", &path, &py_attr)) return NULL; if (!bup_uint_from_py(&attr, py_attr, "attr")) @@ -1595,7 +1724,7 @@ static PyObject *bup_mincore(PyObject *self, PyObject *args) result = PyErr_Format(PyExc_OverflowError, "src_n overflows size_t"); goto clean_and_return; } - int rc = mincore((void *)(src.buf + src_off), src_n, + int rc = mincore((void *)(src.buf + src_off), length, (BUP_MINCORE_BUF_TYPE *) (dest.buf + dest_off)); if (rc != 0) { result = PyErr_SetFromErrno(PyExc_OSError); @@ -1611,6 +1740,501 @@ static PyObject *bup_mincore(PyObject *self, PyObject *args) #endif /* def BUP_MINCORE_BUF_TYPE */ +static PyObject *tuple_from_cstrs(char **cstrs) +{ + // Assumes list is null terminated + size_t n = 0; + while(cstrs[n] != NULL) + n++; + + Py_ssize_t sn; + if (!INTEGRAL_ASSIGNMENT_FITS(&sn, n)) + return PyErr_Format(PyExc_OverflowError, "string array too large"); + + PyObject *result = PyTuple_New(sn); + Py_ssize_t i = 0; + for (i = 0; i < sn; i++) + { + PyObject *gname = Py_BuildValue(cstr_argf, cstrs[i]); + if (gname == NULL) + { + Py_DECREF(result); + return NULL; + } + PyTuple_SET_ITEM(result, i, gname); + } + 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 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) + 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 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"); + + 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) +{ + PyObject *py_name; + if (!PyArg_ParseTuple(args, "S", &py_name)) + return NULL; + + char *name = PyBytes_AS_STRING(py_name); + errno = 0; + struct passwd *pwd = getpwnam(name); + if (!pwd && errno) + return appropriate_errno_ex(); + return pwd_struct_to_py(pwd); +} + +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) + 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 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"); + + 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) +{ + PyObject *py_name; + if (!PyArg_ParseTuple(args, "S", &py_name)) + return NULL; + + char *name = PyBytes_AS_STRING(py_name); + 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 + char buf[HOST_NAME_MAX + 1] = {}; +#else + /* 'SUSv2 guarantees that "Host names are limited to 255 bytes".' */ + char buf[256] = {}; +#endif + + if (gethostname(buf, sizeof(buf) - 1)) + return PyErr_SetFromErrno(PyExc_IOError); + return PyBytes_FromString(buf); +} + + +#ifdef BUP_HAVE_READLINE + +static char *cstr_from_bytes(PyObject *bytes) +{ + char *buf; + Py_ssize_t length; + int rc = PyBytes_AsStringAndSize(bytes, &buf, &length); + if (rc == -1) + return NULL; + char *result = checked_malloc(length, sizeof(char)); + if (!result) + return NULL; + memcpy(result, buf, length); + return result; +} + +static char **cstrs_from_seq(PyObject *seq) +{ + char **result = NULL; + seq = PySequence_Fast(seq, "Cannot convert sequence items to C strings"); + if (!seq) + return NULL; + + const Py_ssize_t len = PySequence_Fast_GET_SIZE(seq); + if (len > PY_SSIZE_T_MAX - 1) { + PyErr_Format(PyExc_OverflowError, + "Sequence length %zd too large for conversion to C array", + len); + goto finish; + } + result = checked_malloc(len + 1, sizeof(char *)); + if (!result) + goto finish; + Py_ssize_t i = 0; + for (i = 0; i < len; i++) + { + PyObject *item = PySequence_Fast_GET_ITEM(seq, i); + if (!item) + goto abandon_result; + result[i] = cstr_from_bytes(item); + if (!result[i]) { + i--; + goto abandon_result; + } + } + result[len] = NULL; + goto finish; + + abandon_result: + if (result) { + for (; i > 0; i--) + free(result[i]); + free(result); + result = NULL; + } + finish: + Py_DECREF(seq); + return result; +} + +static char* our_word_break_chars = NULL; + +static PyObject * +bup_set_completer_word_break_characters(PyObject *self, PyObject *args) +{ + char *bytes; + if (!PyArg_ParseTuple(args, cstr_argf, &bytes)) + return NULL; + char *prev = our_word_break_chars; + char *next = strdup(bytes); + if (!next) + return PyErr_NoMemory(); + our_word_break_chars = next; + rl_completer_word_break_characters = next; + if (prev) + free(prev); + Py_RETURN_NONE; +} + +static PyObject * +bup_get_completer_word_break_characters(PyObject *self, PyObject *args) +{ + if (!PyArg_ParseTuple(args, "")) + return NULL; + return PyBytes_FromString(rl_completer_word_break_characters); +} + +static PyObject *bup_get_line_buffer(PyObject *self, PyObject *args) +{ + if (!PyArg_ParseTuple(args, "")) + return NULL; + return PyBytes_FromString(rl_line_buffer); +} + +static PyObject * +bup_parse_and_bind(PyObject *self, PyObject *args) +{ + char *bytes; + if (!PyArg_ParseTuple(args, cstr_argf ":parse_and_bind", &bytes)) + return NULL; + char *tmp = strdup(bytes); // Because it may modify the arg + if (!tmp) + return PyErr_NoMemory(); + int rc = rl_parse_and_bind(tmp); + free(tmp); + if (rc != 0) + return PyErr_Format(PyExc_OSError, + "system rl_parse_and_bind failed (%d)", rc); + Py_RETURN_NONE; +} + + +static PyObject *py_on_attempted_completion; +static char **prev_completions; + +static char **on_attempted_completion(const char *text, int start, int end) +{ + if (!py_on_attempted_completion) + return NULL; + + char **result = NULL; + PyObject *py_result = PyObject_CallFunction(py_on_attempted_completion, + cstr_argf "ii", + text, start, end); + if (!py_result) + return NULL; + if (py_result != Py_None) { + result = cstrs_from_seq(py_result); + free(prev_completions); + prev_completions = result; + } + Py_DECREF(py_result); + return result; +} + +static PyObject * +bup_set_attempted_completion_function(PyObject *self, PyObject *args) +{ + PyObject *completer; + if (!PyArg_ParseTuple(args, "O", &completer)) + return NULL; + + PyObject *prev = py_on_attempted_completion; + if (completer == Py_None) + { + py_on_attempted_completion = NULL; + rl_attempted_completion_function = NULL; + } else { + py_on_attempted_completion = completer; + rl_attempted_completion_function = on_attempted_completion; + Py_INCREF(completer); + } + Py_XDECREF(prev); + Py_RETURN_NONE; +} + + +static PyObject *py_on_completion_entry; + +static char *on_completion_entry(const char *text, int state) +{ + if (!py_on_completion_entry) + return NULL; + + PyObject *py_result = PyObject_CallFunction(py_on_completion_entry, + cstr_argf "i", text, state); + if (!py_result) + return NULL; + char *result = (py_result == Py_None) ? NULL : cstr_from_bytes(py_result); + Py_DECREF(py_result); + return result; +} + +static PyObject * +bup_set_completion_entry_function(PyObject *self, PyObject *args) +{ + PyObject *completer; + if (!PyArg_ParseTuple(args, "O", &completer)) + return NULL; + + PyObject *prev = py_on_completion_entry; + if (completer == Py_None) { + py_on_completion_entry = NULL; + rl_completion_entry_function = NULL; + } else { + py_on_completion_entry = completer; + rl_completion_entry_function = on_completion_entry; + Py_INCREF(completer); + } + Py_XDECREF(prev); + Py_RETURN_NONE; +} + +static PyObject * +bup_readline(PyObject *self, PyObject *args) +{ + char *prompt; + if (!PyArg_ParseTuple(args, cstr_argf, &prompt)) + return NULL; + char *line = readline(prompt); + if (!line) + return PyErr_Format(PyExc_EOFError, "readline EOF"); + PyObject *result = PyBytes_FromString(line); + free(line); + return result; +} + +#endif // defined BUP_HAVE_READLINE + +#if defined(HAVE_SYS_ACL_H) && \ + defined(HAVE_ACL_LIBACL_H) && \ + defined(HAVE_ACL_EXTENDED_FILE) && \ + defined(HAVE_ACL_GET_FILE) && \ + defined(HAVE_ACL_TO_ANY_TEXT) && \ + defined(HAVE_ACL_FROM_TEXT) && \ + defined(HAVE_ACL_SET_FILE) +#define ACL_SUPPORT 1 +#include +#include + +// Returns +// 0 for success +// -1 for errors, with python exception set +// -2 for ignored errors (not supported) +static int bup_read_acl_to_text(const char *name, acl_type_t type, + char **txt, char **num) +{ + acl_t acl; + + acl = acl_get_file(name, type); + if (!acl) { + if (errno == EOPNOTSUPP || errno == ENOSYS) + return -2; + PyErr_SetFromErrno(PyExc_IOError); + return -1; + } + + *num = NULL; + *txt = acl_to_any_text(acl, "", '\n', TEXT_ABBREVIATE); + if (*txt) + *num = acl_to_any_text(acl, "", '\n', TEXT_ABBREVIATE | TEXT_NUMERIC_IDS); + + if (*txt && *num) + return 0; + + if (errno == ENOMEM) + PyErr_NoMemory(); + else + PyErr_SetFromErrno(PyExc_IOError); + + if (*txt) + acl_free((acl_t)*txt); + if (*num) + acl_free((acl_t)*num); + + return -1; +} + +static PyObject *bup_read_acl(PyObject *self, PyObject *args) +{ + char *name; + int isdir, rv; + PyObject *ret = NULL; + char *acl_txt = NULL, *acl_num = NULL; + + if (!PyArg_ParseTuple(args, cstr_argf "i", &name, &isdir)) + return NULL; + + if (!acl_extended_file(name)) + Py_RETURN_NONE; + + rv = bup_read_acl_to_text(name, ACL_TYPE_ACCESS, &acl_txt, &acl_num); + if (rv) + goto out; + + if (isdir) { + char *def_txt = NULL, *def_num = NULL; + + rv = bup_read_acl_to_text(name, ACL_TYPE_DEFAULT, &def_txt, &def_num); + if (rv) + goto out; + + ret = Py_BuildValue("[" cstr_argf cstr_argf cstr_argf cstr_argf "]", + acl_txt, acl_num, def_txt, def_num); + + if (def_txt) + acl_free((acl_t)def_txt); + if (def_num) + acl_free((acl_t)def_num); + } else { + ret = Py_BuildValue("[" cstr_argf cstr_argf "]", + acl_txt, acl_num); + } + +out: + if (acl_txt) + acl_free((acl_t)acl_txt); + if (acl_num) + acl_free((acl_t)acl_num); + if (rv == -2) + Py_RETURN_NONE; + return ret; +} + +static int bup_apply_acl_string(const char *name, const char *s) +{ + acl_t acl = acl_from_text(s); + int ret = 0; + + if (!acl) { + PyErr_SetFromErrno(PyExc_IOError); + return -1; + } + + if (acl_set_file(name, ACL_TYPE_ACCESS, acl)) { + PyErr_SetFromErrno(PyExc_IOError); + ret = -1; + } + + acl_free(acl); + + return ret; +} + +static PyObject *bup_apply_acl(PyObject *self, PyObject *args) +{ + char *name, *acl, *def = NULL; + + if (!PyArg_ParseTuple(args, cstr_argf cstr_argf "|" cstr_argf, &name, &acl, &def)) + return NULL; + + if (bup_apply_acl_string(name, acl)) + return NULL; + + if (def && bup_apply_acl_string(name, def)) + return NULL; + + Py_RETURN_NONE; +} +#endif + static PyMethodDef helper_methods[] = { { "write_sparsely", bup_write_sparsely, METH_VARARGS, "Write buf excepting zeros at the end. Return trailing zero count." }, @@ -1675,11 +2299,57 @@ static PyMethodDef helper_methods[] = { #endif { "bytescmp", bup_bytescmp, METH_VARARGS, "Return a negative value if x < y, zero if equal, positive otherwise."}, + { "cat_bytes", bup_cat_bytes, METH_VARARGS, + "For (x_bytes, x_ofs, x_n, y_bytes, y_ofs, y_n) arguments, return their concatenation."}, #ifdef BUP_MINCORE_BUF_TYPE { "mincore", bup_mincore, METH_VARARGS, "For mincore(src, src_n, src_off, dest, dest_off)" " call the system mincore(src + src_off, src_n, &dest[dest_off])." }, #endif + { "getpwuid", bup_getpwuid, METH_VARARGS, + "Return the password database entry for the given numeric user id," + " as a tuple with all C strings as bytes(), or None if the user does" + " not exist." }, + { "getpwnam", bup_getpwnam, METH_VARARGS, + "Return the password database entry for the given user name," + " as a tuple with all C strings as bytes(), or None if the user does" + " not exist." }, + { "getgrgid", bup_getgrgid, METH_VARARGS, + "Return the group database entry for the given numeric group id," + " as a tuple with all C strings as bytes(), or None if the group does" + " not exist." }, + { "getgrnam", bup_getgrnam, METH_VARARGS, + "Return the group database entry for the given group name," + " as a tuple with all C strings as bytes(), or None if the group does" + " not exist." }, + { "gethostname", bup_gethostname, METH_NOARGS, + "Return the current hostname (as bytes)" }, +#ifdef BUP_HAVE_READLINE + { "set_completion_entry_function", bup_set_completion_entry_function, METH_VARARGS, + "Set rl_completion_entry_function. Called as f(text, state)." }, + { "set_attempted_completion_function", bup_set_attempted_completion_function, METH_VARARGS, + "Set rl_attempted_completion_function. Called as f(text, start, end)." }, + { "parse_and_bind", bup_parse_and_bind, METH_VARARGS, + "Call rl_parse_and_bind." }, + { "get_line_buffer", bup_get_line_buffer, METH_NOARGS, + "Return rl_line_buffer." }, + { "get_completer_word_break_characters", bup_get_completer_word_break_characters, METH_NOARGS, + "Return rl_completer_word_break_characters." }, + { "set_completer_word_break_characters", bup_set_completer_word_break_characters, METH_VARARGS, + "Set rl_completer_word_break_characters." }, + { "readline", bup_readline, METH_VARARGS, + "Call readline(prompt)." }, +#endif // defined BUP_HAVE_READLINE +#ifdef ACL_SUPPORT + { "read_acl", bup_read_acl, METH_VARARGS, + "read_acl(name, isdir)\n\n" + "Read ACLs for the given file/dirname and return the correctly encoded" + " list [txt, num, def_tx, def_num] (the def_* being empty bytestrings" + " unless the second argument 'isdir' is True)." }, + { "apply_acl", bup_apply_acl, METH_VARARGS, + "apply_acl(name, acl, def=None)\n\n" + "Given a file/dirname (bytes) and the ACLs to restore, do that." }, +#endif /* HAVE_ACLS */ { NULL, NULL, 0, NULL }, // sentinel }; @@ -1690,6 +2360,7 @@ static void test_integral_assignment_fits(void) assert(sizeof(signed short) < sizeof(unsigned long long)); assert(sizeof(unsigned short) < sizeof(signed long long)); assert(sizeof(unsigned short) < sizeof(unsigned long long)); + assert(sizeof(Py_ssize_t) <= sizeof(size_t)); { signed short ss, ssmin = SHRT_MIN, ssmax = SHRT_MAX; unsigned short us, usmax = USHRT_MAX;