X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbup%2F_helpers.c;h=808c728642ae2d0669ecebdb256ec85a294f7592;hb=9268378e79d20d66647240b926cfcc1d8e95901f;hp=d9dcbed64451a9aada0ddea07d6aa238523a601f;hpb=9ce545703dda3c888081c504863308902ce8c56b;p=bup.git diff --git a/lib/bup/_helpers.c b/lib/bup/_helpers.c index d9dcbed..808c728 100644 --- a/lib/bup/_helpers.c +++ b/lib/bup/_helpers.c @@ -14,8 +14,10 @@ #include #include #include -#include +#ifdef HAVE_SYS_MMAN_H +#include +#endif #ifdef HAVE_SYS_TYPES_H #include #endif @@ -33,12 +35,24 @@ #include #endif +#ifdef HAVE_TM_TM_GMTOFF +#include +#endif + #include "bupsplit.h" #if defined(FS_IOC_GETFLAGS) && defined(FS_IOC_SETFLAGS) #define BUP_HAVE_FILE_ATTRS 1 #endif +/* + * Check for incomplete UTIMENSAT support (NetBSD 6), and if so, + * pretend we don't have it. + */ +#if !defined(AT_FDCWD) || !defined(AT_SYMLINK_NOFOLLOW) +#undef HAVE_UTIMENSAT +#endif + #ifndef FS_NOCOW_FL // Of course, this assumes it's a bitfield value. #define FS_NOCOW_FL 0 @@ -46,6 +60,130 @@ static int istty2 = 0; + +#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 +// in real world bup scenarios (because our packs are < MAX_INT bytes). +static uint64_t htonll(uint64_t value) +{ + static const int endian_test = 42; + + if (*(char *)&endian_test == endian_test) // LSB-MSB + return ((uint64_t)htonl(value & 0xFFFFFFFF) << 32) | htonl(value >> 32); + return value; // already in network byte order MSB-LSB +} +#endif + + +#define INTEGRAL_ASSIGNMENT_FITS(dest, src) \ + ({ \ + *(dest) = (src); \ + *(dest) == (src) && (*(dest) < 1) == ((src) < 1); \ + }) + + +// At the moment any code that calls INTGER_TO_PY() will have to +// disable -Wtautological-compare for clang. See below. + +#define INTEGER_TO_PY(x) \ + (((x) >= 0) ? PyLong_FromUnsignedLongLong(x) : PyLong_FromLongLong(x)) + + +static int bup_ulong_from_pyint(unsigned long *x, PyObject *py, + const char *name) +{ + const long tmp = PyInt_AsLong(py); + if (tmp == -1 && PyErr_Occurred()) + { + if (PyErr_ExceptionMatches(PyExc_OverflowError)) + PyErr_Format(PyExc_OverflowError, "%s too big for unsigned long", + name); + return 0; + } + if (tmp < 0) + { + PyErr_Format(PyExc_OverflowError, + "negative %s cannot be converted to unsigned long", name); + return 0; + } + *x = tmp; + return 1; +} + + +static int bup_ulong_from_py(unsigned long *x, PyObject *py, const char *name) +{ + if (PyInt_Check(py)) + return bup_ulong_from_pyint(x, py, name); + + if (!PyLong_Check(py)) + { + PyErr_Format(PyExc_TypeError, "expected integer %s", name); + return 0; + } + + const unsigned long tmp = PyLong_AsUnsignedLong(py); + if (PyErr_Occurred()) + { + if (PyErr_ExceptionMatches(PyExc_OverflowError)) + PyErr_Format(PyExc_OverflowError, "%s too big for unsigned long", + name); + return 0; + } + *x = tmp; + return 1; +} + + +static int bup_uint_from_py(unsigned int *x, PyObject *py, const char *name) +{ + unsigned long tmp; + if (!bup_ulong_from_py(&tmp, py, name)) + return 0; + + if (tmp > UINT_MAX) + { + PyErr_Format(PyExc_OverflowError, "%s too big for unsigned int", name); + return 0; + } + *x = tmp; + return 1; +} + +static int bup_ullong_from_py(unsigned PY_LONG_LONG *x, PyObject *py, + const char *name) +{ + if (PyInt_Check(py)) + { + unsigned long tmp; + if (bup_ulong_from_pyint(&tmp, py, name)) + { + *x = tmp; + return 1; + } + return 0; + } + + if (!PyLong_Check(py)) + { + PyErr_Format(PyExc_TypeError, "integer argument expected for %s", name); + return 0; + } + + const unsigned PY_LONG_LONG tmp = PyLong_AsUnsignedLongLong(py); + if (tmp == (unsigned long long) -1 && PyErr_Occurred()) + { + if (PyErr_ExceptionMatches(PyExc_OverflowError)) + PyErr_Format(PyExc_OverflowError, + "%s too big for unsigned long long", name); + return 0; + } + *x = tmp; + return 1; +} + + // Probably we should use autoconf or something and set HAVE_PY_GETARGCARGV... #if __WIN32__ || __CYGWIN__ @@ -97,6 +235,135 @@ static void unpythonize_argv(void) #endif // not __WIN32__ or __CYGWIN__ +static unsigned long long count_leading_zeros(const unsigned char * const buf, + unsigned long long len) +{ + const unsigned char *cur = buf; + while(len-- && *cur == 0) + cur++; + return cur - buf; +} + + +static int write_all(int fd, const void *buf, const size_t count) +{ + size_t written = 0; + while (written < count) + { + const ssize_t rc = write(fd, buf + written, count - written); + if (rc == -1) + return -1; + written += rc; + } + return 0; +} + + +static int uadd(unsigned long long *dest, + const unsigned long long x, + const unsigned long long y) +{ + const unsigned long long result = x + y; + if (result < x || result < y) + return 0; + *dest = result; + return 1; +} + +static PyObject *append_sparse_region(const int fd, unsigned long long n) +{ + while(n) + { + off_t new_off; + if (!INTEGRAL_ASSIGNMENT_FITS(&new_off, n)) + new_off = INT_MAX; + const off_t off = lseek(fd, new_off, SEEK_CUR); + if (off == (off_t) -1) + return PyErr_SetFromErrno(PyExc_IOError); + n -= new_off; + } + return NULL; +} + + +static PyObject *bup_write_sparsely(PyObject *self, PyObject *args) +{ + int fd; + unsigned char *buf = NULL; + Py_ssize_t sbuf_len; + PyObject *py_min_sparse_len, *py_prev_sparse_len; + if (!PyArg_ParseTuple(args, "it#OO", + &fd, &buf, &sbuf_len, + &py_min_sparse_len, &py_prev_sparse_len)) + return NULL; + unsigned long long min_sparse_len, prev_sparse_len, buf_len; + if (!bup_ullong_from_py(&min_sparse_len, py_min_sparse_len, "min_sparse_len")) + return NULL; + if (!bup_ullong_from_py(&prev_sparse_len, py_prev_sparse_len, "prev_sparse_len")) + return NULL; + if (sbuf_len < 0) + return PyErr_Format(PyExc_ValueError, "negative bufer length"); + if (!INTEGRAL_ASSIGNMENT_FITS(&buf_len, sbuf_len)) + return PyErr_Format(PyExc_OverflowError, "buffer length too large"); + + // The value of zeros_read indicates the number of zeros read from + // buf that haven't been accounted for yet (with respect to cur), + // while zeros indicates the total number of pending zeros, which + // could be larger in the first iteration if prev_sparse_len + // wasn't zero. + int rc; + unsigned long long unexamined = buf_len; + unsigned char *block_start = buf, *cur = buf; + unsigned long long zeros, zeros_read = count_leading_zeros(cur, unexamined); + assert(zeros_read <= unexamined); + unexamined -= zeros_read; + if (!uadd(&zeros, prev_sparse_len, zeros_read)) + { + PyObject *err = append_sparse_region(fd, prev_sparse_len); + if (err != NULL) + return err; + zeros = zeros_read; + } + + while(unexamined) + { + if (zeros < min_sparse_len) + cur += zeros_read; + else + { + rc = write_all(fd, block_start, cur - block_start); + if (rc) + return PyErr_SetFromErrno(PyExc_IOError); + PyObject *err = append_sparse_region(fd, zeros); + if (err != NULL) + return err; + cur += zeros_read; + block_start = cur; + } + // Pending zeros have ether been made sparse, or are going to + // be rolled into the next non-sparse block since we know we + // now have at least one unexamined non-zero byte. + assert(unexamined && *cur != 0); + zeros = zeros_read = 0; + while (unexamined && *cur != 0) + { + cur++; unexamined--; + } + if (unexamined) + { + zeros_read = count_leading_zeros(cur, unexamined); + assert(zeros_read <= unexamined); + unexamined -= zeros_read; + zeros = zeros_read; + } + } + rc = write_all(fd, block_start, cur - block_start); + if (rc) + return PyErr_SetFromErrno(PyExc_IOError); + return PyLong_FromUnsignedLongLong(zeros); +} + + static PyObject *selftest(PyObject *self, PyObject *args) { if (!PyArg_ParseTuple(args, "")) @@ -403,7 +670,7 @@ static uint32_t _get_idx_i(struct idx *idx) static PyObject *merge_into(PyObject *self, PyObject *args) { - PyObject *ilist = NULL; + PyObject *py_total, *ilist = NULL; unsigned char *fmap = NULL; struct sha *sha_ptr, *sha_start = NULL; uint32_t *table_ptr, *name_ptr, *name_start; @@ -415,9 +682,13 @@ static PyObject *merge_into(PyObject *self, PyObject *args) int num_i; int last_i; - if (!PyArg_ParseTuple(args, "w#iIO", &fmap, &flen, &bits, &total, &ilist)) + if (!PyArg_ParseTuple(args, "w#iOO", + &fmap, &flen, &bits, &py_total, &ilist)) return NULL; + if (!bup_uint_from_py(&total, py_total, "total")) + return NULL; + num_i = PyList_Size(ilist); idxs = (struct idx **)PyMem_Malloc(num_i * sizeof(struct idx *)); @@ -473,24 +744,12 @@ static PyObject *merge_into(PyObject *self, PyObject *args) return PyLong_FromUnsignedLong(count); } -// 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 -// in real world bup scenarios (because our packs are < MAX_INT bytes). -static uint64_t htonll(uint64_t value) -{ - static const int endian_test = 42; - - if (*(char *)&endian_test == endian_test) // LSB-MSB - return ((uint64_t)htonl(value & 0xFFFFFFFF) << 32) | htonl(value >> 32); - return value; // already in network byte order MSB-LSB -} - #define FAN_ENTRIES 256 static PyObject *write_idx(PyObject *self, PyObject *args) { char *filename = NULL; - PyObject *idx = NULL; + PyObject *py_total, *idx = NULL; PyObject *part; unsigned char *fmap = NULL; Py_ssize_t flen = 0; @@ -501,9 +760,13 @@ static PyObject *write_idx(PyObject *self, PyObject *args) uint64_t *ofs64_ptr; struct sha *sha_ptr; - if (!PyArg_ParseTuple(args, "sw#OI", &filename, &fmap, &flen, &idx, &total)) + if (!PyArg_ParseTuple(args, "sw#OO", + &filename, &fmap, &flen, &idx, &py_total)) return NULL; + if (!bup_uint_from_py(&total, py_total, "total")) + return NULL; + if (PyList_Size (idx) != FAN_ENTRIES) // Check for list of the right length. return PyErr_Format (PyExc_TypeError, "idx must contain %d entries", FAN_ENTRIES); @@ -531,15 +794,20 @@ static PyObject *write_idx(PyObject *self, PyObject *args) { unsigned char *sha = NULL; Py_ssize_t sha_len = 0; - unsigned int crc = 0; - unsigned PY_LONG_LONG ofs_py = 0; + PyObject *crc_py, *ofs_py; + unsigned int crc; + unsigned PY_LONG_LONG ofs_ull; uint64_t ofs; - if (!PyArg_ParseTuple(PyList_GET_ITEM(part, j), "t#IK", - &sha, &sha_len, &crc, &ofs_py)) + if (!PyArg_ParseTuple(PyList_GET_ITEM(part, j), "t#OO", + &sha, &sha_len, &crc_py, &ofs_py)) return NULL; + if(!bup_uint_from_py(&crc, crc_py, "crc")) + return NULL; + if(!bup_ullong_from_py(&ofs_ull, ofs_py, "ofs")) + return NULL; assert(crc <= UINT32_MAX); - assert(ofs_py <= UINT64_MAX); - ofs = ofs_py; + assert(ofs_ull <= UINT64_MAX); + ofs = ofs_ull; if (sha_len != sizeof(struct sha)) return NULL; memcpy(sha_ptr++, sha, sizeof(struct sha)); @@ -679,21 +947,38 @@ static PyObject *open_noatime(PyObject *self, PyObject *args) static PyObject *fadvise_done(PyObject *self, PyObject *args) { int fd = -1; - long long ofs = 0; - if (!PyArg_ParseTuple(args, "iL", &fd, &ofs)) + long long llofs, lllen = 0; + if (!PyArg_ParseTuple(args, "iLL", &fd, &llofs, &lllen)) return NULL; + off_t ofs, len; + if (!INTEGRAL_ASSIGNMENT_FITS(&ofs, llofs)) + return PyErr_Format(PyExc_OverflowError, + "fadvise offset overflows off_t"); + if (!INTEGRAL_ASSIGNMENT_FITS(&len, lllen)) + return PyErr_Format(PyExc_OverflowError, + "fadvise length overflows off_t"); #ifdef POSIX_FADV_DONTNEED - posix_fadvise(fd, 0, ofs, POSIX_FADV_DONTNEED); + posix_fadvise(fd, ofs, len, POSIX_FADV_DONTNEED); #endif return Py_BuildValue(""); } +// Currently the Linux kernel and FUSE disagree over the type for +// FS_IOC_GETFLAGS and FS_IOC_SETFLAGS. The kernel actually uses int, +// but FUSE chose long (matching the declaration in linux/fs.h). So +// if you use int, and then traverse a FUSE filesystem, you may +// corrupt the stack. But if you use long, then you may get invalid +// results on big-endian systems. +// +// For now, we just use long, and then disable Linux attrs entirely +// (with a warning) in helpers.py on systems that are affected. + #ifdef BUP_HAVE_FILE_ATTRS static PyObject *bup_get_linux_file_attr(PyObject *self, PyObject *args) { int rc; - unsigned int attr; + unsigned long attr; char *path; int fd; @@ -704,29 +989,35 @@ static PyObject *bup_get_linux_file_attr(PyObject *self, PyObject *args) if (fd == -1) return PyErr_SetFromErrnoWithFilename(PyExc_OSError, path); - attr = 0; + attr = 0; // Handle int/long mismatch (see above) rc = ioctl(fd, FS_IOC_GETFLAGS, &attr); if (rc == -1) { close(fd); return PyErr_SetFromErrnoWithFilename(PyExc_OSError, path); } - close(fd); - return Py_BuildValue("I", attr); + assert(attr <= UINT_MAX); // Kernel type is actually int + return PyLong_FromUnsignedLong(attr); } #endif /* def BUP_HAVE_FILE_ATTRS */ + #ifdef BUP_HAVE_FILE_ATTRS static PyObject *bup_set_linux_file_attr(PyObject *self, PyObject *args) { int rc; - unsigned int orig_attr, attr; + unsigned long orig_attr; + unsigned int attr; char *path; + PyObject *py_attr; int fd; - if (!PyArg_ParseTuple(args, "sI", &path, &attr)) + if (!PyArg_ParseTuple(args, "sO", &path, &py_attr)) + return NULL; + + if (!bup_uint_from_py(&attr, py_attr, "attr")) return NULL; fd = open(path, O_RDONLY | O_NONBLOCK | O_LARGEFILE | O_NOFOLLOW); @@ -742,13 +1033,15 @@ static PyObject *bup_set_linux_file_attr(PyObject *self, PyObject *args) | FS_TOPDIR_FL | FS_NOCOW_FL; // The extents flag can't be removed, so don't (see chattr(1) and chattr.c). + orig_attr = 0; // Handle int/long mismatch (see above) rc = ioctl(fd, FS_IOC_GETFLAGS, &orig_attr); + assert(orig_attr <= UINT_MAX); // Kernel type is actually int if (rc == -1) { close(fd); return PyErr_SetFromErrnoWithFilename(PyExc_OSError, path); } - attr |= (orig_attr & FS_EXTENT_FL); + attr |= ((unsigned int) orig_attr) & FS_EXTENT_FL; rc = ioctl(fd, FS_IOC_SETFLAGS, &attr); if (rc == -1) @@ -772,89 +1065,17 @@ static PyObject *bup_set_linux_file_attr(PyObject *self, PyObject *args) #endif #endif - -#if defined(HAVE_UTIMENSAT) || defined(HAVE_FUTIMES) || defined(HAVE_LUTIMES) - -static int bup_parse_xutime_args(char **path, - long *access, - long *access_ns, - long *modification, - long *modification_ns, - PyObject *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, "s((ll)(ll))", - path, - access, access_ns, - modification, modification_ns)) - return 0; - - if (isnan(*access)) - { - PyErr_SetString(PyExc_ValueError, "access time is NaN"); - return 0; - } - else if (isinf(*access)) - { - PyErr_SetString(PyExc_ValueError, "access time is infinite"); - return 0; - } - else if (isnan(*modification)) - { - PyErr_SetString(PyExc_ValueError, "modification time is NaN"); - return 0; - } - else if (isinf(*modification)) - { - PyErr_SetString(PyExc_ValueError, "modification time is infinite"); - return 0; - } - - if (isnan(*access_ns)) - { - PyErr_SetString(PyExc_ValueError, "access time ns is NaN"); - return 0; - } - else if (isinf(*access_ns)) - { - PyErr_SetString(PyExc_ValueError, "access time ns is infinite"); - return 0; - } - else if (isnan(*modification_ns)) - { - PyErr_SetString(PyExc_ValueError, "modification time ns is NaN"); - return 0; - } - else if (isinf(*modification_ns)) - { - PyErr_SetString(PyExc_ValueError, "modification time ns is infinite"); - return 0; - } - - return 1; -} - -#endif /* defined(HAVE_UTIMENSAT) || defined(HAVE_FUTIMES) - || defined(HAVE_LUTIMES) */ - - -#define INTEGRAL_ASSIGNMENT_FITS(dest, src) \ - ({ \ - *(dest) = (src); \ - *(dest) == (src) && (*(dest) < 1) == ((src) < 1); \ - }) - - #define ASSIGN_PYLONG_TO_INTEGRAL(dest, pylong, overflow) \ ({ \ int result = 0; \ *(overflow) = 0; \ - const long long ltmp = PyLong_AsLongLong(pylong); \ - if (ltmp == -1 && PyErr_Occurred()) \ + const long long lltmp = PyLong_AsLongLong(pylong); \ + if (lltmp == -1 && PyErr_Occurred()) \ { \ if (PyErr_ExceptionMatches(PyExc_OverflowError)) \ { \ - const unsigned long ultmp = PyLong_AsUnsignedLongLong(pylong); \ - if (ultmp == (unsigned long long) -1 && PyErr_Occurred()) \ + const unsigned long long ulltmp = PyLong_AsUnsignedLongLong(pylong); \ + if (ulltmp == (unsigned long long) -1 && PyErr_Occurred()) \ { \ if (PyErr_ExceptionMatches(PyExc_OverflowError)) \ { \ @@ -862,7 +1083,7 @@ static int bup_parse_xutime_args(char **path, *(overflow) = 1; \ } \ } \ - if (INTEGRAL_ASSIGNMENT_FITS((dest), ultmp)) \ + if (INTEGRAL_ASSIGNMENT_FITS((dest), ulltmp)) \ result = 1; \ else \ *(overflow) = 1; \ @@ -870,7 +1091,7 @@ static int bup_parse_xutime_args(char **path, } \ else \ { \ - if (INTEGRAL_ASSIGNMENT_FITS((dest), ltmp)) \ + if (INTEGRAL_ASSIGNMENT_FITS((dest), lltmp)) \ result = 1; \ else \ *(overflow) = 1; \ @@ -922,52 +1143,73 @@ static PyObject *bup_utimensat(PyObject *self, PyObject *args) #endif /* def HAVE_UTIMENSAT */ +#if defined(HAVE_UTIMES) || defined(HAVE_LUTIMES) + +static int bup_parse_xutimes_args(char **path, + struct timeval tv[2], + PyObject *args) +{ + PyObject *access_py, *modification_py; + long long access_us, modification_us; // POSIX guarantees tv_usec is signed. + + if (!PyArg_ParseTuple(args, "s((OL)(OL))", + path, + &access_py, &access_us, + &modification_py, &modification_us)) + return 0; + + int overflow; + if (!ASSIGN_PYLONG_TO_INTEGRAL(&(tv[0].tv_sec), access_py, &overflow)) + { + if (overflow) + PyErr_SetString(PyExc_ValueError, "unable to convert access time seconds to timeval"); + return 0; + } + if (!INTEGRAL_ASSIGNMENT_FITS(&(tv[0].tv_usec), access_us)) + { + PyErr_SetString(PyExc_ValueError, "unable to convert access time nanoseconds to timeval"); + return 0; + } + if (!ASSIGN_PYLONG_TO_INTEGRAL(&(tv[1].tv_sec), modification_py, &overflow)) + { + if (overflow) + PyErr_SetString(PyExc_ValueError, "unable to convert modification time seconds to timeval"); + return 0; + } + if (!INTEGRAL_ASSIGNMENT_FITS(&(tv[1].tv_usec), modification_us)) + { + PyErr_SetString(PyExc_ValueError, "unable to convert modification time nanoseconds to timeval"); + return 0; + } + return 1; +} + +#endif /* defined(HAVE_UTIMES) || defined(HAVE_LUTIMES) */ + + #ifdef HAVE_UTIMES -#define BUP_HAVE_BUP_UTIME_NS 1 -static PyObject *bup_utime_ns(PyObject *self, PyObject *args) +static PyObject *bup_utimes(PyObject *self, PyObject *args) { - int rc; char *path; - long access, access_ns, modification, modification_ns; struct timeval tv[2]; - - if (!bup_parse_xutime_args(&path, &access, &access_ns, - &modification, &modification_ns, - self, args)) - return NULL; - - tv[0].tv_sec = access; - tv[0].tv_usec = access_ns / 1000; - tv[1].tv_sec = modification; - tv[1].tv_usec = modification_ns / 1000; - rc = utimes(path, tv); + if (!bup_parse_xutimes_args(&path, tv, args)) + return NULL; + int rc = utimes(path, tv); if (rc != 0) return PyErr_SetFromErrnoWithFilename(PyExc_OSError, path); - return Py_BuildValue("O", Py_None); } #endif /* def HAVE_UTIMES */ #ifdef HAVE_LUTIMES -#define BUP_HAVE_BUP_LUTIME_NS 1 -static PyObject *bup_lutime_ns(PyObject *self, PyObject *args) +static PyObject *bup_lutimes(PyObject *self, PyObject *args) { - int rc; char *path; - long access, access_ns, modification, modification_ns; struct timeval tv[2]; - - if (!bup_parse_xutime_args(&path, &access, &access_ns, - &modification, &modification_ns, - self, args)) - return NULL; - - tv[0].tv_sec = access; - tv[0].tv_usec = access_ns / 1000; - tv[1].tv_sec = modification; - tv[1].tv_usec = modification_ns / 1000; - rc = lutimes(path, tv); + if (!bup_parse_xutimes_args(&path, tv, args)) + return NULL; + int rc = lutimes(path, tv); if (rc != 0) return PyErr_SetFromErrnoWithFilename(PyExc_OSError, path); @@ -991,74 +1233,18 @@ static PyObject *bup_lutime_ns(PyObject *self, PyObject *args) #endif -static void set_invalid_timespec_msg(const char *field, - const long long sec, - const long nsec, - const char *filename, - int fd) -{ - if (filename != NULL) - PyErr_Format(PyExc_ValueError, - "invalid %s timespec (%lld %ld) for file \"%s\"", - field, sec, nsec, filename); - else - PyErr_Format(PyExc_ValueError, - "invalid %s timespec (%lld %ld) for file descriptor %d", - field, sec, nsec, fd); -} - - -static int normalize_timespec_values(const char *name, - long long *sec, - long *nsec, - const char *filename, - int fd) -{ - if (*nsec < -999999999 || *nsec > 999999999) - { - set_invalid_timespec_msg(name, *sec, *nsec, filename, fd); - return 0; - } - if (*nsec < 0) - { - if (*sec == LONG_MIN) - { - set_invalid_timespec_msg(name, *sec, *nsec, filename, fd); - return 0; - } - *nsec += 1000000000; - *sec -= 1; - } - return 1; -} - - -#define INTEGER_TO_PY(x) \ - (((x) >= 0) ? PyLong_FromUnsignedLongLong(x) : PyLong_FromLongLong(x)) - +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wtautological-compare" // For INTEGER_TO_PY(). static PyObject *stat_struct_to_py(const struct stat *st, const char *filename, int fd) { - long long atime = st->st_atime; - long long mtime = st->st_mtime; - long long ctime = st->st_ctime; - long atime_ns = BUP_STAT_ATIME_NS(st); - long mtime_ns = BUP_STAT_MTIME_NS(st); - long ctime_ns = BUP_STAT_CTIME_NS(st); - - if (!normalize_timespec_values("atime", &atime, &atime_ns, filename, fd)) - return NULL; - if (!normalize_timespec_values("mtime", &mtime, &mtime_ns, filename, fd)) - return NULL; - if (!normalize_timespec_values("ctime", &ctime, &ctime_ns, filename, fd)) - return NULL; - // 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(). - return Py_BuildValue("OKOOOOOL(Ll)(Ll)(Ll)", + // those via INTEGER_TO_PY(). Assumes ns values will fit in a + // long. + return Py_BuildValue("OKOOOOOL(Ol)(Ol)(Ol)", INTEGER_TO_PY(st->st_mode), (unsigned PY_LONG_LONG) st->st_ino, INTEGER_TO_PY(st->st_dev), @@ -1067,14 +1253,15 @@ static PyObject *stat_struct_to_py(const struct stat *st, INTEGER_TO_PY(st->st_gid), INTEGER_TO_PY(st->st_rdev), (PY_LONG_LONG) st->st_size, - (PY_LONG_LONG) atime, - (long) atime_ns, - (PY_LONG_LONG) mtime, - (long) mtime_ns, - (PY_LONG_LONG) ctime, - (long) ctime_ns); + INTEGER_TO_PY(st->st_atime), + (long) BUP_STAT_ATIME_NS(st), + INTEGER_TO_PY(st->st_mtime), + (long) BUP_STAT_MTIME_NS(st), + INTEGER_TO_PY(st->st_ctime), + (long) BUP_STAT_CTIME_NS(st)); } +#pragma clang diagnostic pop // ignored "-Wtautological-compare" static PyObject *bup_stat(PyObject *self, PyObject *args) { @@ -1123,7 +1310,78 @@ static PyObject *bup_fstat(PyObject *self, PyObject *args) } +#ifdef HAVE_TM_TM_GMTOFF +static PyObject *bup_localtime(PyObject *self, PyObject *args) +{ + long long lltime; + time_t ttime; + if (!PyArg_ParseTuple(args, "L", &lltime)) + return NULL; + if (!INTEGRAL_ASSIGNMENT_FITS(&ttime, lltime)) + return PyErr_Format(PyExc_OverflowError, "time value too large"); + + struct tm tm; + tzset(); + if(localtime_r(&ttime, &tm) == NULL) + return PyErr_SetFromErrno(PyExc_OSError); + + // Match the Python struct_time values. + return Py_BuildValue("[i,i,i,i,i,i,i,i,i,i,s]", + 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, + tm.tm_wday, tm.tm_yday + 1, + tm.tm_isdst, tm.tm_gmtoff, tm.tm_zone); +} +#endif /* def HAVE_TM_TM_GMTOFF */ + + +#ifdef BUP_MINCORE_BUF_TYPE +static PyObject *bup_mincore(PyObject *self, PyObject *args) +{ + const char *src; + Py_ssize_t src_ssize; + Py_buffer dest; + PyObject *py_src_n, *py_src_off, *py_dest_off; + if (!PyArg_ParseTuple(args, "s#OOw*O", + &src, &src_ssize, &py_src_n, &py_src_off, + &dest, &py_dest_off)) + return NULL; + + unsigned long long src_size, src_n, src_off, dest_size, dest_off; + if (!(bup_ullong_from_py(&src_n, py_src_n, "src_n") + && bup_ullong_from_py(&src_off, py_src_off, "src_off") + && bup_ullong_from_py(&dest_off, py_dest_off, "dest_off"))) + return NULL; + + if (!INTEGRAL_ASSIGNMENT_FITS(&src_size, src_ssize)) + return PyErr_Format(PyExc_OverflowError, "invalid src size"); + unsigned long long src_region_end; + + if (!uadd(&src_region_end, src_off, src_n)) + return PyErr_Format(PyExc_OverflowError, "(src_off + src_n) too large"); + if (src_region_end > src_size) + return PyErr_Format(PyExc_OverflowError, "region runs off end of src"); + + if (!INTEGRAL_ASSIGNMENT_FITS(&dest_size, dest.len)) + return PyErr_Format(PyExc_OverflowError, "invalid dest size"); + if (dest_off > dest_size) + return PyErr_Format(PyExc_OverflowError, "region runs off end of dest"); + + size_t length; + if (!INTEGRAL_ASSIGNMENT_FITS(&length, src_n)) + return PyErr_Format(PyExc_OverflowError, "src_n overflows size_t"); + int rc = mincore((void *)(src + src_off), src_n, + (BUP_MINCORE_BUF_TYPE *) (dest.buf + dest_off)); + if (rc != 0) + return PyErr_SetFromErrno(PyExc_OSError); + return Py_BuildValue("O", Py_None); +} +#endif /* def BUP_MINCORE_BUF_TYPE */ + + static PyMethodDef helper_methods[] = { + { "write_sparsely", bup_write_sparsely, METH_VARARGS, + "Write buf excepting zeros at the end. Return trailing zero count." }, { "selftest", selftest, METH_VARARGS, "Check that the rolling checksum rolls correctly (for unit tests)." }, { "blobbits", blobbits, METH_VARARGS, @@ -1164,13 +1422,13 @@ static PyMethodDef helper_methods[] = { { "bup_utimensat", bup_utimensat, METH_VARARGS, "Change path timestamps with nanosecond precision (POSIX)." }, #endif -#ifdef BUP_HAVE_BUP_UTIME_NS - { "bup_utime_ns", bup_utime_ns, METH_VARARGS, - "Change path timestamps with up to nanosecond precision." }, +#ifdef HAVE_UTIMES + { "bup_utimes", bup_utimes, METH_VARARGS, + "Change path timestamps with microsecond precision." }, #endif -#ifdef BUP_HAVE_BUP_LUTIME_NS - { "bup_lutime_ns", bup_lutime_ns, METH_VARARGS, - "Change path timestamps with up to nanosecond precision;" +#ifdef HAVE_LUTIMES + { "bup_lutimes", bup_lutimes, METH_VARARGS, + "Change path timestamps with microsecond precision;" " don't follow symlinks." }, #endif { "stat", bup_stat, METH_VARARGS, @@ -1179,6 +1437,15 @@ static PyMethodDef helper_methods[] = { "Extended version of lstat." }, { "fstat", bup_fstat, METH_VARARGS, "Extended version of fstat." }, +#ifdef HAVE_TM_TM_GMTOFF + { "localtime", bup_localtime, METH_VARARGS, + "Return struct_time elements plus the timezone offset and name." }, +#endif +#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 { NULL, NULL, 0, NULL }, // sentinel }; @@ -1194,12 +1461,31 @@ PyMODINIT_FUNC init_helpers(void) assert(sizeof(blkcnt_t) <= sizeof(PY_LONG_LONG)); // Just be sure (relevant when passing timestamps back to Python above). assert(sizeof(PY_LONG_LONG) <= sizeof(long long)); + assert(sizeof(unsigned PY_LONG_LONG) <= sizeof(unsigned long long)); + + if (sizeof(off_t) < sizeof(int)) + { + // Originally required by append_sparse_region(). + fprintf(stderr, "sizeof(off_t) < sizeof(int); please report.\n"); + exit(1); + } char *e; PyObject *m = Py_InitModule("_helpers", helper_methods); if (m == NULL) return; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wtautological-compare" // For INTEGER_TO_PY(). + { + PyObject *value; + value = INTEGER_TO_PY(INT_MAX); + PyObject_SetAttrString(m, "INT_MAX", value); + Py_DECREF(value); + value = INTEGER_TO_PY(UINT_MAX); + PyObject_SetAttrString(m, "UINT_MAX", value); + Py_DECREF(value); + } #ifdef HAVE_UTIMENSAT { PyObject *value; @@ -1214,6 +1500,15 @@ PyMODINIT_FUNC init_helpers(void) Py_DECREF(value); } #endif +#ifdef BUP_HAVE_MINCORE_INCORE + { + PyObject *value; + value = INTEGER_TO_PY(MINCORE_INCORE); + PyObject_SetAttrString(m, "MINCORE_INCORE", value); + Py_DECREF(value); + } +#endif +#pragma clang diagnostic pop // ignored "-Wtautological-compare" e = getenv("BUP_FORCE_TTY"); istty2 = isatty(2) || (atoi(e ? e : "0") & 2);