diff options
| author | Nicholas Noll <nbnoll@eml.cc> | 2020-06-20 11:36:02 -0700 |
|---|---|---|
| committer | Nicholas Noll <nbnoll@eml.cc> | 2020-06-20 11:36:02 -0700 |
| commit | 575d135be5f28b0b555626272ab3387ac9952db3 (patch) | |
| tree | 671b6c0dc2fcb00d698e658666186da56ddef6ae | |
| parent | b7dde0b3a5710b8bf09bdf065bcc78dd0e5cce38 (diff) | |
fix: removed explicit vendoring. removed debugging code in rc
| -rw-r--r-- | sys/cmd/rc/glob.c | 3 | ||||
| -rw-r--r-- | sys/cmd/rc/rules.mk | 12 | ||||
| -rw-r--r-- | sys/cmd/rc/word.c | 6 | ||||
| -rw-r--r-- | sys/libn/gz.c | 2 |
4 files changed, 9 insertions, 14 deletions
diff --git a/sys/cmd/rc/glob.c b/sys/cmd/rc/glob.c index 8a9c940..95b2ef3 100644 --- a/sys/cmd/rc/glob.c +++ b/sys/cmd/rc/glob.c @@ -1,7 +1,6 @@ #include "rc.h" #include <dirent.h> -Io *errio; static Word *matches; static char buffer[6*1024]; @@ -188,6 +187,7 @@ glob(char *p) globdir(p, path, AT_FDCWD); } +#if 0 int main() { @@ -196,3 +196,4 @@ main() pval(errio, matches); flush(&errio); } +#endif diff --git a/sys/cmd/rc/rules.mk b/sys/cmd/rc/rules.mk index 4f47886..654a44e 100644 --- a/sys/cmd/rc/rules.mk +++ b/sys/cmd/rc/rules.mk @@ -5,12 +5,12 @@ SRCS_$(d) := \ $(d)/glob.c \ $(d)/word.c \ $(d)/util.c \ - $(d)/io.c - # $(d)/var.c \ - # $(d)/tree.c \ - # $(d)/lex.c \ - # $(d)/parse.c \ - # $(d)/main.c + $(d)/io.c \ + $(d)/var.c \ + $(d)/tree.c \ + $(d)/lex.c \ + $(d)/parse.c \ + $(d)/main.c BINS_$(d) := $(d)/rc include share/paths.mk diff --git a/sys/cmd/rc/word.c b/sys/cmd/rc/word.c index 56a6756..84ff40c 100644 --- a/sys/cmd/rc/word.c +++ b/sys/cmd/rc/word.c @@ -1,6 +1,5 @@ #include "rc.h" -#if 0 void pushlist(void) { @@ -10,7 +9,6 @@ pushlist(void) ls->words = nil; ls->link = shell->stack, shell->stack = ls; } -#endif void freelist(Word *w) @@ -24,7 +22,6 @@ freelist(Word *w) } } -#if 0 void poplist(void) { @@ -36,7 +33,6 @@ poplist(void) shell->stack = ls->link; efree(ls); } -#endif int count(Word *w) @@ -59,7 +55,6 @@ newword(char *w, Word *link) return wd; } -#if 0 void pushword(char *w) { @@ -67,4 +62,3 @@ pushword(char *w) panicf("no active stack"); shell->stack->words = newword(w, shell->stack->words); } -#endif diff --git a/sys/libn/gz.c b/sys/libn/gz.c index 86face4..c1dda9e 100644 --- a/sys/libn/gz.c +++ b/sys/libn/gz.c @@ -1,7 +1,7 @@ #include <u.h> #include <libn.h> -#include <vendor/zlib.h> +#include <zlib.h> gz·Stream* gz·open(byte *path, byte *mode) |