diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/fs/basename.c (renamed from src/base/os/basename.c) | 4 | ||||
| -rw-r--r-- | src/base/fs/dirname.c (renamed from src/base/os/dirname.c) | 2 | ||||
| -rw-r--r-- | src/base/fs/exists.c (renamed from src/base/os/exists.c) | 2 | ||||
| -rw-r--r-- | src/base/fs/rules.mk | 3 | ||||
| -rw-r--r-- | src/base/os/internal.h | 4 | ||||
| -rw-r--r-- | src/base/os/rules.mk | 5 | ||||
| -rw-r--r-- | src/base/os/sep.c | 14 | ||||
| -rw-r--r-- | src/base/rules.mk | 1 |
8 files changed, 7 insertions, 28 deletions
diff --git a/src/base/os/basename.c b/src/base/fs/basename.c index b5bb343..2f097da 100644 --- a/src/base/os/basename.c +++ b/src/base/fs/basename.c @@ -1,10 +1,10 @@ #include "internal.h" char* -os·basename(char *path) +fs·basename(char *path) { char *sep; - sep = strrchr(path, os·sep()); + sep = strrchr(path, '/'); return (sep == nil) ? path : sep+1; } diff --git a/src/base/os/dirname.c b/src/base/fs/dirname.c index c7ed2ee..f312f63 100644 --- a/src/base/os/dirname.c +++ b/src/base/fs/dirname.c @@ -1,7 +1,7 @@ #include "internal.h" char* -os·dirname(char *path) +fs·dirname(char *path) { char *sep; diff --git a/src/base/os/exists.c b/src/base/fs/exists.c index a3c8935..1841a41 100644 --- a/src/base/os/exists.c +++ b/src/base/fs/exists.c @@ -1,7 +1,7 @@ #include "internal.h" int -os·exists(byte *path, int flag) +fs·exists(byte *path, int flag) { return access(path, flag) == 0; } diff --git a/src/base/fs/rules.mk b/src/base/fs/rules.mk index 3927ae3..663a80c 100644 --- a/src/base/fs/rules.mk +++ b/src/base/fs/rules.mk @@ -1,3 +1,6 @@ SRCS_$(d)+=\ + $(d)/fs/basename.c\ + $(d)/fs/dirname.c\ + $(d)/fs/exists.c\ $(d)/fs/walk.c\ $(d)/fs/walker.c\ diff --git a/src/base/os/internal.h b/src/base/os/internal.h deleted file mode 100644 index 302c035..0000000 --- a/src/base/os/internal.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#include <u.h> -#include <base.h> diff --git a/src/base/os/rules.mk b/src/base/os/rules.mk deleted file mode 100644 index c6eb43e..0000000 --- a/src/base/os/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -SRCS_$(d)+=\ - $(d)/os/basename.c\ - $(d)/os/dirname.c\ - $(d)/os/exists.c\ - $(d)/os/sep.c\ diff --git a/src/base/os/sep.c b/src/base/os/sep.c deleted file mode 100644 index 750e627..0000000 --- a/src/base/os/sep.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "internal.h" - -int -os·sep(void) -{ -#if defined(UNIX) || defined(__linux__) - return '/'; -#elif defined(WIN32) - return '\\'; -#else - panicf("unrecognized operating system"); - return '\0'; -#endif -} diff --git a/src/base/rules.mk b/src/base/rules.mk index 0fefead..fe7bb13 100644 --- a/src/base/rules.mk +++ b/src/base/rules.mk @@ -15,7 +15,6 @@ include $(d)/fs/rules.mk include $(d)/gz/rules.mk include $(d)/mem/rules.mk include $(d)/mmap/rules.mk -include $(d)/os/rules.mk include $(d)/rng/rules.mk include $(d)/sort/rules.mk include $(d)/string/rules.mk |