Merge pull request #12700 from yuwata/udev-propagate-critical-errors

udev: modernize code and propagate critical errors

src/basic/fs-util.h

@@ -14,6 +14,13 @@
 #include "errno-util.h"
 #include "time-util.h"
 
+#define MODE_INVALID ((mode_t) -1)
+
+/* The following macros add 1 when converting things, since 0 is a valid mode, while the pointer
+ * NULL is special */
+#define PTR_TO_MODE(p) ((mode_t) ((uintptr_t) (p)-1))
+#define MODE_TO_PTR(u) ((void *) ((uintptr_t) (u)+1))
+
 int unlink_noerrno(const char *path);
 
 int rmdir_parents(const char *path, const char *stop);

src/basic/parse-util.h

@@ -9,8 +9,6 @@
 
 #include "macro.h"
 
-#define MODE_INVALID ((mode_t) -1)
-
 int parse_boolean(const char *v) _pure_;
 int parse_dev(const char *s, dev_t *ret);
 int parse_pid(const char *s, pid_t* ret_pid);

src/basic/strxcpyx.c

@@ -17,16 +17,13 @@
 
 #include "strxcpyx.h"
 
-size_t strpcpy(char **dest, size_t size, const char *src) {
-        size_t len;
-
+size_t strnpcpy(char **dest, size_t size, const char *src, size_t len) {
         assert(dest);
         assert(src);
 
         if (size == 0)
                 return 0;
 
-        len = strlen(src);
         if (len >= size) {
                 if (size > 1)
                         *dest = mempcpy(*dest, src, size-1);
@@ -40,6 +37,13 @@ size_t strpcpy(char **dest, size_t size, const char *src) {
         return size;
 }
 
+size_t strpcpy(char **dest, size_t size, const char *src) {
+        assert(dest);
+        assert(src);
+
+        return strnpcpy(dest, size, src, strlen(src));
+}
+
 size_t strpcpyf(char **dest, size_t size, const char *src, ...) {
         va_list va;
         int i;
@@ -76,14 +80,21 @@ size_t strpcpyl(char **dest, size_t size, const char *src, ...) {
         return size;
 }
 
-size_t strscpy(char *dest, size_t size, const char *src) {
+size_t strnscpy(char *dest, size_t size, const char *src, size_t len) {
         char *s;
 
         assert(dest);
         assert(src);
 
         s = dest;
-        return strpcpy(&s, size, src);
+        return strnpcpy(&s, size, src, len);
+}
+
+size_t strscpy(char *dest, size_t size, const char *src) {
+        assert(dest);
+        assert(src);
+
+        return strnscpy(dest, size, src, strlen(src));
 }
 
 size_t strscpyl(char *dest, size_t size, const char *src, ...) {

src/basic/strxcpyx.h

@@ -5,8 +5,10 @@
 
 #include "macro.h"
 
+size_t strnpcpy(char **dest, size_t size, const char *src, size_t len);
 size_t strpcpy(char **dest, size_t size, const char *src);
 size_t strpcpyf(char **dest, size_t size, const char *src, ...) _printf_(3, 4);
 size_t strpcpyl(char **dest, size_t size, const char *src, ...) _sentinel_;
+size_t strnscpy(char *dest, size_t size, const char *src, size_t len);
 size_t strscpy(char *dest, size_t size, const char *src);
 size_t strscpyl(char *dest, size_t size, const char *src, ...) _sentinel_;