[PATCH] udev - safer string handling all over the place

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index c20c651dc53687056d701c0a8714a7f5d39f3b9b..8794429635bd0caec5f53b294dcd713464f720b2 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -72,8 +72,8 @@ static int delete_node(struct udevice *dev)
        int retval;
        int i;
 
        int retval;
        int i;
 

-       strncpy(filename, udev_root, sizeof(filename));
-       strncat(filename, dev->name, sizeof(filename));
+       strfieldcpy(filename, udev_root);
+       strfieldcat(filename, dev->name);

 
        info("removing device node '%s'", filename);
        retval = unlink(filename);
 
        info("removing device node '%s'", filename);
        retval = unlink(filename);


@@ -103,8 +103,8 @@ static int delete_node(struct udevice *dev)
                        if (linkname == NULL)
                                break;
 
                        if (linkname == NULL)
                                break;
 

-                       strncpy(filename, udev_root, sizeof(filename));
-                       strncat(filename, linkname, sizeof(filename));
+                       strfieldcpy(filename, udev_root);
+                       strfieldcat(filename, linkname);

 
                        dbg("unlinking symlink '%s'", filename);
                        retval = unlink(filename);
 
                        dbg("unlinking symlink '%s'", filename);
                        retval = unlink(filename);


@@ -141,7 +141,7 @@ int udev_remove_device(char *path, char *subsystem)
                temp = strrchr(path, '/');
                if (temp == NULL)
                        return -ENODEV;
                temp = strrchr(path, '/');
                if (temp == NULL)
                        return -ENODEV;

-               strncpy(dev.name, &temp[1], sizeof(dev.name));
+               strfieldcpy(dev.name, &temp[1]);

        }
 
        dbg("name is '%s'", dev.name);
        }
 
        dbg("name is '%s'", dev.name);