systemd-python: fix setting of exception codes

[elogind.git] / src / python-systemd / pyutil.c

diff --git a/src/python-systemd/pyutil.c b/src/python-systemd/pyutil.c
index 9510acdddbcc76a6dfb072b19dc8c9ac30c102e3..722c4f5b5f89f6c11214f003e7afb13969f6ad30 100644 (file)
--- a/src/python-systemd/pyutil.c
+++ b/src/python-systemd/pyutil.c
@@ -30,17 +30,51 @@ void cleanup_Py_DECREFp(PyObject **p) {
 }
 
 PyObject* absolute_timeout(uint64_t t) {
-    if (t == (uint64_t) -1)
-        return PyLong_FromLong(-1);
-    else {
-        struct timespec ts;
-        uint64_t n;
-        int msec;
-
-        clock_gettime(CLOCK_MONOTONIC, &ts);
-        n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
-        msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
-
-        return PyLong_FromLong(msec);
-    }
+        if (t == (uint64_t) -1)
+                return PyLong_FromLong(-1);
+        else {
+                struct timespec ts;
+                uint64_t n;
+                int msec;
+
+                clock_gettime(CLOCK_MONOTONIC, &ts);
+                n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+                msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
+
+                return PyLong_FromLong(msec);
+        }
+}
+
+int set_error(int r, const char* path, const char* invalid_message) {
+        if (r >= 0)
+                return r;
+        if (r == -EINVAL && invalid_message)
+                PyErr_SetString(PyExc_ValueError, invalid_message);
+        else if (r == -ENOMEM)
+                PyErr_SetString(PyExc_MemoryError, "Not enough memory");
+        else {
+                errno = -r;
+                PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
+        }
+        return -1;
+}
+
+#if PY_MAJOR_VERSION >=3 && PY_MINOR_VERSION >= 1
+int Unicode_FSConverter(PyObject* obj, void *_result) {
+        PyObject **result = _result;
+
+        assert(result);
+
+        if (!obj)
+                /* cleanup: we don't return Py_CLEANUP_SUPPORTED, so
+                 * we can assume that it was PyUnicode_FSConverter. */
+                return PyUnicode_FSConverter(obj, result);
+
+        if (obj == Py_None) {
+                *result = NULL;
+                return 1;
+        }
+
+        return PyUnicode_FSConverter(obj, result);
 }
+#endif