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 b8b4d10d21d62ae973bbf39d2f289376539756ac..84ff09e0506925a805149f712eb8310c20bfad5a 100644 (file)
--- a/udev/udev_utils_file.c
+++ b/udev/udev_utils_file.c
@@ -1,22 +1,20 @@
 /*
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- * 
- *     This program is distributed in the hope that it will be useful, but
- *     WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *     General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License along
- *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -33,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;
@@ -69,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;
 
@@ -93,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);
@@ -110,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;
 }