chore(rm): removed small os package. moved functions to filesystem

12 files changed, 13 insertions, 38 deletions

diff --git a/include/base/fs.h b/include/base/fs.h
index bb7ffdc..b2d61c3 100644
--- a/include/base/fs.h
+++ b/include/base/fs.h
@@ -27,3 +27,7 @@ struct fs·Walker
 int  fs·init(fs·Walker *, char *path);
 void fs·fini(fs·Walker *);
 void fs·walk(fs·Walker *);
+
+int     fs·exists(byte *path, int flag);
+byte   *fs·dirname(byte *path);
+byte   *fs·basename(byte *path);
diff --git a/include/base/io.h b/include/base/io.h
index 541159f..dae57ef 100644
--- a/include/base/io.h
+++ b/include/base/io.h
@@ -132,11 +132,3 @@ intptr io·offset(io·Header *io);
 
 int    io·print(io·Header *io, char *fmt, ...);
 int    io·vprint(io·Header *io, char *fmt, va_list args);
-
-/* basic os helpers */
-/* XXX: find a better location for this */
-int     os·exists(byte *path, int flag);
-byte   *os·dirname(byte *path);
-byte   *os·basename(byte *path);
-int     os·sep(void);
-
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
diff --git a/src/cmd/core/basename.c b/src/cmd/core/basename.c
index 263592f..23d7b22 100644
--- a/src/cmd/core/basename.c
+++ b/src/cmd/core/basename.c
@@ -24,7 +24,7 @@ main(int argc, char *argv[])
     if(argc < 1 || argc > 2)
         usage();
 
-    p = d ? os·dirname(argv[0]) : os·basename(argv[0]);
+    p = d ? fs·dirname(argv[0]) : fs·basename(argv[0]);
     if(argc>1){
         n = strlen(p)-strlen(argv[1]);
         if(n >= 0 && strcmp(p+n, argv[1])==0)
diff --git a/src/cmd/rc/glob.c b/src/cmd/rc/glob.c
index eee0318..d3c7699 100644
--- a/src/cmd/rc/glob.c
+++ b/src/cmd/rc/glob.c
@@ -139,7 +139,7 @@ globpath(char *p, char *buf)
     /* we ran out of pattern, no glob */
     if(*base == 0){
         *s = 0;
-        if(os·exists(globbuf, 0))
+        if(fs·exists(globbuf, 0))
             globmatch = makeword(globbuf, globmatch);
         return;
     }