From af818017edcda1e212bb2bc5fe0cd50ddd5ec657 Mon Sep 17 00:00:00 2001
From: H Hautakoski <henrik@fiktivkod.org>
Date: Sat, 21 Aug 2010 22:07:03 +0200
Subject: [PATCH] common/path: throwing away base/dirname in favor of libgen.h

---
 src/common/path.c | 77 -----------------------------------------------
 src/common/path.h |  6 +---
 2 files changed, 1 insertion(+), 82 deletions(-)

diff --git a/src/common/path.c b/src/common/path.c
index 9215387..3db7524 100644
--- a/src/common/path.c
+++ b/src/common/path.c
@@ -17,8 +17,6 @@
 #include "debug.h"
 #include "path.h"
 
-static char defpath[2];
-
 /*
  * allocates and initilizes a path
  */
@@ -83,30 +81,6 @@ static char* cpy_path(char *buf, const char *path) {
 	return buf;
 }
 
-static char* split_path(char *path) {
-
-    char *last = path+strlen(path)-1, *slash = NULL;
-
-    while(*last == '/' && (last--) > path);
-
-    while(last > path) {
-
-        if (*last == '/') {
-            slash = last;
-        } else if (slash != NULL) {
-            break;
-        }
-
-        last--;
-    }
-
-    if (slash == NULL)
-        return path;
-
-    return slash;
-}
-
-
 int is_abspath(const char *path) {
 	
 	if (*path != '/')
@@ -169,54 +143,3 @@ char* fmt_path(const char *base, const char *name, unsigned char dir) {
 	
 	return ret;
 }
-
-char* basename(char *path) {
-
-    char *pos = path;
-
-    if (path == NULL || *path == '\0') {
-        defpath[0] = '.';
-        defpath[1] = '\0';
-        return defpath;
-    }
-
-    while(*path != '\0') {
-        if (*path == '/') {
-            if (*(path+1) == '\0') {
-                if (pos >= path)
-                    break;
-                *(path--) = '\0';
-                continue;
-            }
-            if (*(path+1) != '/')
-                pos = path+1;
-        }
-        path++;
-    }
-
-    return pos;
-}
-
-char* dirname(char *path) {
-
-    char *last, *slash = NULL;
-	size_t len;
-
-    if (path == NULL || *path == '\0') {
-        defpath[0] = '.';
-        defpath[1] = '\0';
-        return defpath;
-    }
-
-	len = split_path(path) - path;
-
-    if (len <= 1) {
-        if (*path != '/') 
-            path[0] = '.';
-        path[1] = '\0';
-    } else {
-        path[len] = '\0';
-    }
-
-	return path;
-}
diff --git a/src/common/path.h b/src/common/path.h
index 041f516..ee195f5 100644
--- a/src/common/path.h
+++ b/src/common/path.h
@@ -9,10 +9,10 @@
  */
 
 #ifndef __COMMON_PATH_H
-
 #define __COMMON_PATH_H
 
 #include <stddef.h>
+#include <libgen.h>
 
 int is_abspath(const char *path);
 
@@ -20,8 +20,4 @@ size_t pathlen(const char *path);
 
 char* fmt_path(const char *base, const char *name, unsigned char dir);
 
-char* basename(char *path);
-
-char* dirname(char *path);
-
 #endif /* __COMMON_PATH_H */