fix segfault caused by wrong pointer used in dbg()

[elogind.git] / udev / udev_utils_file.c

diff --git a/udev/udev_utils_file.c b/udev/udev_utils_file.c
index 19b0f22ba8f01972f63927b346a400d97fe53fb8..84ff09e0506925a805149f712eb8310c20bfad5a 100644 (file)
--- a/udev/udev_utils_file.c
+++ b/udev/udev_utils_file.c
@@ -31,12 +31,12 @@
 
 int create_path(struct udev *udev, const char *path)
 {
-       char p[PATH_SIZE];
+       char p[UTIL_PATH_SIZE];
        char *pos;
        struct stat stats;
        int ret;
 
-       strlcpy(p, path, sizeof(p));
+       util_strlcpy(p, path, sizeof(p));
        pos = strrchr(p, '/');
        if (pos == p || pos == NULL)
                return 0;
@@ -67,7 +67,7 @@ int create_path(struct udev *udev, const char *path)
 
 int delete_path(struct udev *udev, const char *path)
 {
-       char p[PATH_SIZE];
+       char p[UTIL_PATH_SIZE];
        char *pos;
        int retval;
 
@@ -91,7 +91,7 @@ int delete_path(struct udev *udev, const char *path)
                if (retval) {
                        if (errno == ENOTEMPTY)
                                return 0;
-                       err(udev, "rmdir(%s) failed: %s\n", p, strerror(errno));
+                       err(udev, "rmdir(%s) failed: %m\n", p);
                        break;
                }
                dbg(udev, "removed '%s'\n", p);
@@ -108,18 +108,18 @@ int unlink_secure(struct udev *udev, const char *filename)
 
        retval = chown(filename, 0, 0);
        if (retval)
-               err(udev, "chown(%s, 0, 0) failed: %s\n", filename, strerror(errno));
+               err(udev, "chown(%s, 0, 0) failed: %m\n", filename);
 
        retval = chmod(filename, 0000);
        if (retval)
-               err(udev, "chmod(%s, 0000) failed: %s\n", filename, strerror(errno));
+               err(udev, "chmod(%s, 0000) failed: %m\n", filename);
 
        retval = unlink(filename);
        if (errno == ENOENT)
                retval = 0;
 
        if (retval)
-               err(udev, "unlink(%s) failed: %s\n", filename, strerror(errno));
+               err(udev, "unlink(%s) failed: %m\n", filename);
 
        return retval;
 }