picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libudev: util - drop util_delete_path() 

Use rmdir_parents() from src/shared instead.
This commit is contained in:
Tom Gundersen 2014-09-15 14:20:32 +02:00
parent 23bf8dd7d5
commit 37d522746b
4 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libudev/libudev-private.h
View File

@ -167,7 +167,6 @@ unsigned int util_string_hash32(const char *key);
uint64_t util_string_bloom64(const char *str);
/* libudev-util-private.c */
int util_delete_path(struct udev *udev, const char *path);
int util_resolve_subsys_kernel(struct udev *udev, const char *string, char *result, size_t maxsize, int read_value);
#endif

32
src/libudev/libudev-util.c
View File

@ -45,38 +45,6 @@
* Utilities useful when dealing with devices and device node names.
*/
int util_delete_path(struct udev *udev, const char *path)
{
char p[UTIL_PATH_SIZE];
char *pos;
int err = 0;
if (path[0] == '/')
while(path[1] == '/')
path++;
strscpy(p, sizeof(p), path);
pos = strrchr(p, '/');
if (pos == p || pos == NULL)
return 0;
for (;;) {
*pos = '\0';
pos = strrchr(p, '/');
/* don't remove the last one */
if ((pos == p) || (pos == NULL))
break;
err = rmdir(p);
if (err < 0) {
if (errno == ENOENT)
err = 0;
break;
}
}
return err;
}
/* handle "[<SUBSYSTEM>/<KERNEL>]<attribute>" format */
int util_resolve_subsys_kernel(struct udev *udev, const char *string,
char *result, size_t maxsize, int read_value)

2
src/test/test-udev.c
View File

@ -149,7 +149,7 @@ int main(int argc, char *argv[]) {
mknod(udev_device_get_devnode(dev), mode, udev_device_get_devnum(dev));
} else {
unlink(udev_device_get_devnode(dev));
util_delete_path(udev, udev_device_get_devnode(dev));
rmdir_parents(udev_device_get_devnode(dev), "/");
}
}

3
src/udev/udev-node.c
View File

@ -179,7 +179,6 @@ static const char *link_find_prioritized(struct udev_device *dev, bool add, cons
/* manage "stack of names" with possibly specified device priorities */
static void link_update(struct udev_device *dev, const char *slink, bool add) {
struct udev *udev = udev_device_get_udev(dev);
char name_enc[UTIL_PATH_SIZE];
char filename[UTIL_PATH_SIZE * 2];
char dirname[UTIL_PATH_SIZE];
@ -197,7 +196,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add) {
if (target == NULL) {
log_debug("no reference left, remove '%s'", slink);
if (unlink(slink) == 0)
util_delete_path(udev, slink);
rmdir_parents(slink, "/");
} else {
log_debug("creating link '%s' to '%s'", slink, target);
node_symlink(dev, target, slink);