lib/fileutils: add stripoff_last_component() from libmount

Signed-off-by: Karel Zak <kzak@redhat.com>

2 files changed, 13 insertions, 11 deletions

diff --git a/lib/fileutils.c b/lib/fileutils.c
index 3d4553179..a1b475757 100644
--- a/lib/fileutils.c
+++ b/lib/fileutils.c
@@ -117,3 +117,15 @@ int mkdir_p(const char *path, mode_t mode)
 	free(dir);
 	return rc;
 }
+
+/* returns basename and keeps dirname in the @path, if @path is "/" (root)
+ * then returns empty string */
+char *stripoff_last_component(char *path)
+{
+	char *p = path ? strrchr(path, '/') : NULL;
+
+	if (!p)
+		return NULL;
+	*p = '\0';
+	return p + 1;
+}
diff --git a/lib/sysfs.c b/lib/sysfs.c
index eee082753..b51a4ff26 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -10,6 +10,7 @@
 #include "at.h"
 #include "pathnames.h"
 #include "sysfs.h"
+#include "fileutils.h"
 
 char *sysfs_devno_attribute_path(dev_t devno, char *buf,
 				 size_t bufsiz, const char *attr)
@@ -510,17 +511,6 @@ char *sysfs_get_devname(struct sysfs_cxt *cxt, char *buf, size_t bufsiz)
 	return buf;
 }
 
-/* returns basename and keeps dirname in the @path */
-static char *stripoff_last_component(char *path)
-{
-    char *p = strrchr(path, '/');
-
-    if (!p)
-        return NULL;
-    *p = '\0';
-    return ++p;
-}
-
 static int get_dm_wholedisk(struct sysfs_cxt *cxt, char *diskname,
                 size_t len, dev_t *diskdevno)
 {