[PATCH] udev - drop all methods :)

[elogind.git] / libsysfs / sysfs_utils.c

diff --git a/libsysfs/sysfs_utils.c b/libsysfs/sysfs_utils.c
index 4e96051c780452809f087efb52bf543f3855b021..009ae94efaa8534f1f75f67f1118c79729761ede 100644 (file)
--- a/libsysfs/sysfs_utils.c
+++ b/libsysfs/sysfs_utils.c
@@ -1,5 +1,5 @@
 /*
- * syfs_utils.c
+ * sysfs_utils.c
  *
  * System utility functions for libsysfs
  *
@@ -76,6 +76,23 @@ static int sysfs_get_fs_mnt_path(const unsigned char *fs_type,
 #endif
 }
 
+/*
+ * sysfs_trailing_slash: checks if there's a trailing slash to path
+ * @path: path to check
+ * returns 1 if true and 0 if not
+ */
+int sysfs_trailing_slash(unsigned char *path)
+{
+       unsigned char *s = NULL;
+
+       if (path == NULL)
+               return 0;
+       s = &path[strlen(path)-1];
+       if (strncmp(s, "/", 1) == 0)
+               return 1;
+       return 0;
+}
+
 /*
  * sysfs_get_mnt_path: Gets the sysfs mount point.
  * @mnt_path: place to put "sysfs" mount point
@@ -118,17 +135,21 @@ int sysfs_get_name_from_path(const unsigned char *path, unsigned char *name,
        }
        memset(tmp, 0, SYSFS_PATH_MAX);
        strcpy(tmp, path);
-       n = &tmp[strlen(tmp)-1];
-       if (strncmp(n, "/", 1) == 0)
-               *n = '\0';      
        n = strrchr(tmp, '/');
        if (n == NULL) {
                errno = EINVAL;
                return -1;
        }
+       if (*(n+1) == '\0') {
+               *n = '\0';
+               n = strrchr(tmp, '/');
+               if (n == NULL) {
+                       errno = EINVAL;
+                       return -1;
+               }
+       }
        n++;
        strncpy(name, n, len);
-
        return 0;
 }
 
@@ -216,7 +237,6 @@ struct dlist *sysfs_open_subsystem_list(unsigned char *name)
        unsigned char *c = NULL;
        struct sysfs_directory *dir = NULL, *cur = NULL;
        struct dlist *list = NULL;
-       struct stat astats;
        
        if (name == NULL)
                return NULL;
@@ -225,7 +245,8 @@ struct dlist *sysfs_open_subsystem_list(unsigned char *name)
                dprintf("Error getting sysfs mount point\n");
                return NULL;
        }
-
+       if (sysfs_trailing_slash(sysfs_path) == 0)
+               strcat(sysfs_path, "/");
        strcat(sysfs_path, name);
        dir = sysfs_open_directory(sysfs_path);
        if (dir == NULL) {
@@ -233,7 +254,7 @@ struct dlist *sysfs_open_subsystem_list(unsigned char *name)
                return NULL;
        }
 
-       if (sysfs_read_directory(dir) != 0) {
+       if ((sysfs_read_dir_subdirs(dir)) != 0) {
                dprintf("Error reading sysfs_directory at %s\n", sysfs_path);
                sysfs_close_directory(dir);
                return NULL;
@@ -261,16 +282,12 @@ struct dlist *sysfs_open_subsystem_list(unsigned char *name)
         * name requested here is "class", verify if "block" is supported on
         * this system and return the same.
         */ 
-       if (strcmp(name, SYSFS_CLASS_DIR) == 0) {
+       if (strcmp(name, SYSFS_CLASS_NAME) == 0) {
                c = strstr(sysfs_path, SYSFS_CLASS_NAME);
                if (c == NULL)
                        goto out;
                strcpy(c, SYSFS_BLOCK_NAME);
-               if ((lstat(sysfs_path, &astats)) != 0) {
-                       dprintf("stat() failed\n");
-                       goto out;
-               }
-               if (S_ISDIR(astats.st_mode)) {
+               if ((sysfs_path_is_dir(sysfs_path)) == 0) {
                        subsys_name = (char *)calloc(1, SYSFS_NAME_LEN);
                        strcpy(subsys_name, SYSFS_BLOCK_NAME);
                        dlist_unshift(list, subsys_name);
@@ -301,17 +318,20 @@ struct dlist *sysfs_open_bus_devices_list(unsigned char *name)
                return NULL;
        }
 
-       strcat(sysfs_path, SYSFS_BUS_DIR);
+       if (sysfs_trailing_slash(sysfs_path) == 0)
+               strcat(sysfs_path, "/");
+       strcat(sysfs_path, SYSFS_BUS_NAME);
        strcat(sysfs_path, "/");
        strcat(sysfs_path, name);
-       strcat(sysfs_path, SYSFS_DEVICES_DIR);
+       strcat(sysfs_path, "/");
+       strcat(sysfs_path, SYSFS_DEVICES_NAME);
        dir = sysfs_open_directory(sysfs_path);
        if (dir == NULL) {
                dprintf("Error opening sysfs_directory at %s\n", sysfs_path);
                return NULL;
        }
 
-       if (sysfs_read_directory(dir) != 0) {
+       if ((sysfs_read_dir_links(dir)) != 0) {
                dprintf("Error reading sysfs_directory at %s\n", sysfs_path);
                sysfs_close_directory(dir);
                return NULL;
@@ -337,3 +357,71 @@ struct dlist *sysfs_open_bus_devices_list(unsigned char *name)
        return list;
 }
 
+/**
+ * sysfs_path_is_dir: Check if the path supplied points to a directory
+ * @path: path to validate
+ * Returns 0 if path points to dir, 1 otherwise
+ */
+int sysfs_path_is_dir(const unsigned char *path)
+{
+       struct stat astats;
+
+       if (path == NULL) {
+               errno = EINVAL;
+               return 1;
+       }
+       if ((lstat(path, &astats)) != 0) {
+               dprintf("stat() failed\n");
+               return 1;
+       }
+       if (S_ISDIR(astats.st_mode))
+               return 0;
+
+       return 1;
+}
+
+/**
+ * sysfs_path_is_link: Check if the path supplied points to a link
+ * @path: path to validate
+ * Returns 0 if path points to link, 1 otherwise
+ */
+int sysfs_path_is_link(const unsigned char *path)
+{
+       struct stat astats;
+
+       if (path == NULL) {
+               errno = EINVAL;
+               return 1;
+       }
+       if ((lstat(path, &astats)) != 0) {
+               dprintf("stat() failed\n");
+               return 1;
+       }
+       if (S_ISLNK(astats.st_mode))
+               return 0;
+
+       return 1;
+}
+
+/**
+ * sysfs_path_is_file: Check if the path supplied points to a file
+ * @path: path to validate
+ * Returns 0 if path points to file, 1 otherwise
+ */
+int sysfs_path_is_file(const unsigned char *path)
+{
+       struct stat astats;
+
+       if (path == NULL) {
+               errno = EINVAL;
+               return 1;
+       }
+       if ((lstat(path, &astats)) != 0) {
+               dprintf("stat() failed\n");
+               return 1;
+       }
+       if (S_ISREG(astats.st_mode))
+               return 0;
+
+       return 1;
+}