pnx/archived
Archived
1
0
Fork 0
Code Activity

common/path: throwing away base/dirname in favor of libgen.h

Browse source
This commit is contained in:
H Hautakoski 2010-08-21 22:07:03 +02:00 • committed by Henrik Hautakoski
parent 3b91895093
commit af818017ed
2 changed files with 1 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

77
src/common/path.c
View file

@ -17,8 +17,6 @@
#include "debug.h" #include "debug.h"
#include "path.h" #include "path.h"
static char defpath[2];
/* /*
* allocates and initilizes a path * allocates and initilizes a path
*/ */
@ -83,30 +81,6 @@ static char* cpy_path(char *buf, const char *path) {
return buf; 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) { int is_abspath(const char *path) {
if (*path != '/') if (*path != '/')
@ -169,54 +143,3 @@ char* fmt_path(const char *base, const char *name, unsigned char dir) {
return ret; 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;
}

6
src/common/path.h
View file

@ -9,10 +9,10 @@
*/ */
#ifndef __COMMON_PATH_H #ifndef __COMMON_PATH_H
#define __COMMON_PATH_H #define __COMMON_PATH_H
#include <stddef.h> #include <stddef.h>
#include <libgen.h>
int is_abspath(const char *path); 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* fmt_path(const char *base, const char *name, unsigned char dir);
char* basename(char *path);
char* dirname(char *path);
#endif /* __COMMON_PATH_H */ #endif /* __COMMON_PATH_H */