diff options
Diffstat (limited to '')
-rw-r--r-- | bin/1sh/.gitignore (renamed from bin/catsh/.gitignore) | 2 | ||||
-rw-r--r-- | bin/1sh/1sh-kill.1 (renamed from bin/catsh/catsh-kill.1) | 2 | ||||
-rw-r--r-- | bin/1sh/1sh-printf.1 (renamed from bin/catsh/catsh-printf.1) | 2 | ||||
-rw-r--r-- | bin/1sh/1sh-test.1 (renamed from bin/catsh/catsh-test.1) | 2 | ||||
-rw-r--r-- | bin/1sh/1sh.1 (renamed from bin/catsh/catsh.1) | 24 | ||||
-rw-r--r-- | bin/1sh/Makefile (renamed from bin/catsh/Makefile) | 20 | ||||
-rw-r--r-- | bin/1sh/TOUR (renamed from bin/catsh/TOUR) | 0 | ||||
-rw-r--r-- | bin/1sh/alias.c (renamed from bin/catsh/alias.c) | 0 | ||||
-rw-r--r-- | bin/1sh/alias.h (renamed from bin/catsh/alias.h) | 0 | ||||
-rw-r--r-- | bin/1sh/arith.h (renamed from bin/catsh/arith.h) | 0 | ||||
-rw-r--r-- | bin/1sh/arith_yacc.c (renamed from bin/catsh/arith_yacc.c) | 0 | ||||
-rw-r--r-- | bin/1sh/arith_yacc.h (renamed from bin/catsh/arith_yacc.h) | 0 | ||||
-rw-r--r-- | bin/1sh/arith_yylex.c (renamed from bin/catsh/arith_yylex.c) | 0 | ||||
-rw-r--r-- | bin/1sh/bltin.h (renamed from bin/catsh/bltin.h) | 0 | ||||
-rw-r--r-- | bin/1sh/builtins.def (renamed from bin/catsh/builtins.def) | 0 | ||||
-rw-r--r-- | bin/1sh/cd.c (renamed from bin/catsh/cd.c) | 0 | ||||
-rw-r--r-- | bin/1sh/cd.h (renamed from bin/catsh/cd.h) | 0 | ||||
-rw-r--r-- | bin/1sh/echo.c (renamed from bin/catsh/echo.c) | 0 | ||||
-rw-r--r-- | bin/1sh/error.c (renamed from bin/catsh/error.c) | 0 | ||||
-rw-r--r-- | bin/1sh/error.h (renamed from bin/catsh/error.h) | 0 | ||||
-rw-r--r-- | bin/1sh/eval.c (renamed from bin/catsh/eval.c) | 0 | ||||
-rw-r--r-- | bin/1sh/eval.h (renamed from bin/catsh/eval.h) | 0 | ||||
-rw-r--r-- | bin/1sh/exec.c (renamed from bin/catsh/exec.c) | 0 | ||||
-rw-r--r-- | bin/1sh/exec.h (renamed from bin/catsh/exec.h) | 0 | ||||
-rw-r--r-- | bin/1sh/expand.c (renamed from bin/catsh/expand.c) | 0 | ||||
-rw-r--r-- | bin/1sh/expand.h (renamed from bin/catsh/expand.h) | 0 | ||||
-rw-r--r-- | bin/1sh/histedit.c (renamed from bin/catsh/histedit.c) | 0 | ||||
-rw-r--r-- | bin/1sh/input.c (renamed from bin/catsh/input.c) | 0 | ||||
-rw-r--r-- | bin/1sh/input.h (renamed from bin/catsh/input.h) | 0 | ||||
-rw-r--r-- | bin/1sh/jobs.c (renamed from bin/catsh/jobs.c) | 0 | ||||
-rw-r--r-- | bin/1sh/jobs.h (renamed from bin/catsh/jobs.h) | 0 | ||||
-rw-r--r-- | bin/1sh/kill.c (renamed from bin/catsh/kill.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/.gitignore (renamed from bin/catsh/libedit/.gitignore) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/Makefile (renamed from bin/catsh/libedit/Makefile) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/chared.c (renamed from bin/catsh/libedit/chared.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/chared.h (renamed from bin/catsh/libedit/chared.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/chartype.c (renamed from bin/catsh/libedit/chartype.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/chartype.h (renamed from bin/catsh/libedit/chartype.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/common.c (renamed from bin/catsh/libedit/common.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/config.h (renamed from bin/catsh/libedit/config.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/editline.3 (renamed from bin/catsh/libedit/editline.3) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/editline.7 (renamed from bin/catsh/libedit/editline.7) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/editrc.5 (renamed from bin/catsh/libedit/editrc.5) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/el.c (renamed from bin/catsh/libedit/el.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/el.h (renamed from bin/catsh/libedit/el.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/eln.c (renamed from bin/catsh/libedit/eln.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/emacs.c (renamed from bin/catsh/libedit/emacs.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/filecomplete.c (renamed from bin/catsh/libedit/filecomplete.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/filecomplete.h (renamed from bin/catsh/libedit/filecomplete.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/hist.c (renamed from bin/catsh/libedit/hist.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/hist.h (renamed from bin/catsh/libedit/hist.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/histedit.h (renamed from bin/catsh/libedit/histedit.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/history.c (renamed from bin/catsh/libedit/history.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/historyn.c (renamed from bin/catsh/libedit/historyn.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/keymacro.c (renamed from bin/catsh/libedit/keymacro.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/keymacro.h (renamed from bin/catsh/libedit/keymacro.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/literal.c (renamed from bin/catsh/libedit/literal.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/literal.h (renamed from bin/catsh/libedit/literal.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/makelist (renamed from bin/catsh/libedit/makelist) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/map.c (renamed from bin/catsh/libedit/map.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/map.h (renamed from bin/catsh/libedit/map.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/parse.c (renamed from bin/catsh/libedit/parse.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/parse.h (renamed from bin/catsh/libedit/parse.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/prompt.c (renamed from bin/catsh/libedit/prompt.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/prompt.h (renamed from bin/catsh/libedit/prompt.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/read.c (renamed from bin/catsh/libedit/read.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/read.h (renamed from bin/catsh/libedit/read.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/readline.c (renamed from bin/catsh/libedit/readline.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/readline/Makefile (renamed from bin/catsh/libedit/readline/Makefile) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/readline/readline.h (renamed from bin/catsh/libedit/readline/readline.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/refresh.c (renamed from bin/catsh/libedit/refresh.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/refresh.h (renamed from bin/catsh/libedit/refresh.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/search.c (renamed from bin/catsh/libedit/search.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/search.h (renamed from bin/catsh/libedit/search.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/shlib_version (renamed from bin/catsh/libedit/shlib_version) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/sig.c (renamed from bin/catsh/libedit/sig.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/sig.h (renamed from bin/catsh/libedit/sig.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/sys.h (renamed from bin/catsh/libedit/sys.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/terminal.c (renamed from bin/catsh/libedit/terminal.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/terminal.h (renamed from bin/catsh/libedit/terminal.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/tokenizer.c (renamed from bin/catsh/libedit/tokenizer.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/tokenizern.c (renamed from bin/catsh/libedit/tokenizern.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/tty.c (renamed from bin/catsh/libedit/tty.c) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/tty.h (renamed from bin/catsh/libedit/tty.h) | 0 | ||||
-rw-r--r-- | bin/1sh/libedit/vi.c (renamed from bin/catsh/libedit/vi.c) | 0 | ||||
-rw-r--r-- | bin/1sh/mail.c (renamed from bin/catsh/mail.c) | 0 | ||||
-rw-r--r-- | bin/1sh/mail.h (renamed from bin/catsh/mail.h) | 0 | ||||
-rw-r--r-- | bin/1sh/main.c (renamed from bin/catsh/main.c) | 0 | ||||
-rw-r--r-- | bin/1sh/main.h (renamed from bin/catsh/main.h) | 0 | ||||
-rw-r--r-- | bin/1sh/memalloc.c (renamed from bin/catsh/memalloc.c) | 0 | ||||
-rw-r--r-- | bin/1sh/memalloc.h (renamed from bin/catsh/memalloc.h) | 0 | ||||
-rw-r--r-- | bin/1sh/miscbltin.c (renamed from bin/catsh/miscbltin.c) | 0 | ||||
-rwxr-xr-x | bin/1sh/mkbuiltins (renamed from bin/catsh/mkbuiltins) | 0 | ||||
-rw-r--r-- | bin/1sh/mknodes.c (renamed from bin/catsh/mknodes.c) | 0 | ||||
-rw-r--r-- | bin/1sh/mksyntax.c (renamed from bin/catsh/mksyntax.c) | 0 | ||||
-rw-r--r-- | bin/1sh/mktokens (renamed from bin/catsh/mktokens) | 0 | ||||
-rw-r--r-- | bin/1sh/myhistedit.h (renamed from bin/catsh/myhistedit.h) | 0 | ||||
-rw-r--r-- | bin/1sh/mystring.c (renamed from bin/catsh/mystring.c) | 0 | ||||
-rw-r--r-- | bin/1sh/mystring.h (renamed from bin/catsh/mystring.h) | 0 | ||||
-rw-r--r-- | bin/1sh/nodes.c.pat (renamed from bin/catsh/nodes.c.pat) | 0 | ||||
-rw-r--r-- | bin/1sh/nodetypes (renamed from bin/catsh/nodetypes) | 0 | ||||
-rw-r--r-- | bin/1sh/options.c (renamed from bin/catsh/options.c) | 0 | ||||
-rw-r--r-- | bin/1sh/options.h (renamed from bin/catsh/options.h) | 0 | ||||
-rw-r--r-- | bin/1sh/output.c (renamed from bin/catsh/output.c) | 0 | ||||
-rw-r--r-- | bin/1sh/output.h (renamed from bin/catsh/output.h) | 0 | ||||
-rw-r--r-- | bin/1sh/parser.c (renamed from bin/catsh/parser.c) | 0 | ||||
-rw-r--r-- | bin/1sh/parser.h (renamed from bin/catsh/parser.h) | 0 | ||||
-rw-r--r-- | bin/1sh/printf.c (renamed from bin/catsh/printf.c) | 0 | ||||
-rw-r--r-- | bin/1sh/redir.c (renamed from bin/catsh/redir.c) | 0 | ||||
-rw-r--r-- | bin/1sh/redir.h (renamed from bin/catsh/redir.h) | 0 | ||||
-rw-r--r-- | bin/1sh/shell.h (renamed from bin/catsh/shell.h) | 0 | ||||
-rw-r--r-- | bin/1sh/show.c (renamed from bin/catsh/show.c) | 0 | ||||
-rw-r--r-- | bin/1sh/show.h (renamed from bin/catsh/show.h) | 0 | ||||
-rw-r--r-- | bin/1sh/test.c (renamed from bin/catsh/test.c) | 0 | ||||
-rw-r--r-- | bin/1sh/trap.c (renamed from bin/catsh/trap.c) | 0 | ||||
-rw-r--r-- | bin/1sh/trap.h (renamed from bin/catsh/trap.h) | 0 | ||||
-rw-r--r-- | bin/1sh/var.c (renamed from bin/catsh/var.c) | 4 | ||||
-rw-r--r-- | bin/1sh/var.h (renamed from bin/catsh/var.h) | 0 |
118 files changed, 28 insertions, 28 deletions
diff --git a/bin/catsh/.gitignore b/bin/1sh/.gitignore index b17c0219..54db1cf1 100644 --- a/bin/catsh/.gitignore +++ b/bin/1sh/.gitignore @@ -1,8 +1,8 @@ *.o .depend +1sh builtins.c builtins.h -catsh config.mk mknodes mksyntax diff --git a/bin/catsh/catsh-kill.1 b/bin/1sh/1sh-kill.1 index 405efff2..b8fef5ff 100644 --- a/bin/catsh/catsh-kill.1 +++ b/bin/1sh/1sh-kill.1 @@ -33,7 +33,7 @@ .\" $FreeBSD: releng/12.0/bin/kill/kill.1 314436 2017-02-28 23:42:47Z imp $ .\" .Dd October 3, 2016 -.Dt CATSH-KILL 1 +.Dt 1SH-KILL 1 .Os .Sh NAME .Nm kill diff --git a/bin/catsh/catsh-printf.1 b/bin/1sh/1sh-printf.1 index 5c8a4fa3..8ef04674 100644 --- a/bin/catsh/catsh-printf.1 +++ b/bin/1sh/1sh-printf.1 @@ -32,7 +32,7 @@ .\" $FreeBSD: releng/12.0/usr.bin/printf/printf.1 314436 2017-02-28 23:42:47Z imp $ .\" .Dd April 21, 2014 -.Dt CATSH-PRINTF 1 +.Dt 1SH-PRINTF 1 .Os .Sh NAME .Nm printf diff --git a/bin/catsh/catsh-test.1 b/bin/1sh/1sh-test.1 index fa97af5a..78cd75f9 100644 --- a/bin/catsh/catsh-test.1 +++ b/bin/1sh/1sh-test.1 @@ -33,7 +33,7 @@ .\" $FreeBSD: releng/12.0/bin/test/test.1 314436 2017-02-28 23:42:47Z imp $ .\" .Dd October 5, 2016 -.Dt CATSH-TEST 1 +.Dt 1SH-TEST 1 .Os .Sh NAME .Nm test , diff --git a/bin/catsh/catsh.1 b/bin/1sh/1sh.1 index 1bae0acb..8cb7bd49 100644 --- a/bin/catsh/catsh.1 +++ b/bin/1sh/1sh.1 @@ -33,12 +33,12 @@ .\" $FreeBSD: releng/12.0/bin/sh/sh.1 336483 2018-07-19 13:09:29Z 0mp $ . .Dd June 24, 2019 -.Dt CATSH 1 +.Dt 1SH 1 .Os . .Sh NAME -.Nm catsh -.Nd a shell +.Nm 1sh +.Nd a (one) shell . .Sh SYNOPSIS .Nm @@ -142,7 +142,7 @@ The default value of .Ev ENV is: .Pp -.Dl "ENV=$XDG_CONFIG_HOME/catsh/env.sh" +.Dl "ENV=$XDG_CONFIG_HOME/1sh/env.sh" . .Pp The first non-option argument specified on the command line @@ -335,7 +335,7 @@ The surrounding shell may kill the child or it may just return control to the tty and leave the child alone, like this: .Bd -literal -offset indent -catsh -T -c "trap 'exit 1' 2 ; some-blocking-program" +1sh -T -c "trap 'exit 1' 2 ; some-blocking-program" .Ed . .It Fl u Li nounset @@ -2141,7 +2141,7 @@ it is sought in the current working directory. A built-in equivalent of .Xr test 1 . This version is documented in -.Xr catsh-test 1 . +.Xr 1sh-test 1 . . .It Ic alias Oo Ar name Ns Oo = Ns Ar string Oc ... Oc If @@ -2654,7 +2654,7 @@ A built-in equivalent of .Xr kill 1 that additionally supports sending signals to jobs. This version is documented in -.Xr catsh-kill 1 . +.Xr 1sh-kill 1 . . .It Ic local Oo Ar variable ... Oc Op Fl See the @@ -2665,7 +2665,7 @@ subsection. A built-in equivalent of .Xr printf 1 . This version is documented in -.Xr catsh-printf 1 . +.Xr 1sh-printf 1 . . .It Ic pwd Op Fl L | P Print the path of the current directory. @@ -2872,7 +2872,7 @@ should be avoided, since the shell may abort. A built-in equivalent of .Xr test 1 . This version is documented in -.Xr catsh-test 1 . +.Xr 1sh-test 1 . . .It Ic times Print the amount of time spent executing the shell process and its children. @@ -3165,10 +3165,10 @@ builtin is used with a numeric argument, it will return the argument. . .Sh SEE ALSO +.Xr 1sh-kill 1 , +.Xr 1sh-printf 1 , +.Xr 1sh-test 1 , .Xr builtin 1 , -.Xr catsh-kill 1 , -.Xr catsh-printf 1 , -.Xr catsh-test 1 , .Xr chsh 1 , .Xr echo 1 , .Xr ed 1 , diff --git a/bin/catsh/Makefile b/bin/1sh/Makefile index 092d8be6..ad85a46a 100644 --- a/bin/catsh/Makefile +++ b/bin/1sh/Makefile @@ -40,11 +40,11 @@ GENHDRS = builtins.h nodes.h syntax.h token.h SRCS += $(GENSRCS) OBJS = $(SRCS:.c=.o) libedit/libedit.a -MAN1 = catsh.1 catsh-kill.1 catsh-printf.1 catsh-test.1 +MAN1 = 1sh.1 1sh-kill.1 1sh-printf.1 1sh-test.1 -all: tags catsh +all: tags 1sh -catsh: $(OBJS) +1sh: $(OBJS) $(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@ $(OBJS): $(GENHDRS) @@ -73,19 +73,19 @@ depend: $(SRCS) $(GENHDRS) -include .depend clean: - rm -f catsh $(OBJS) mknodes mksyntax $(GENSRCS) $(GENHDRS) tags .depend + rm -f 1sh $(OBJS) mknodes mksyntax $(GENSRCS) $(GENHDRS) tags .depend -install: catsh $(MAN1) +install: 1sh $(MAN1) install -d $(PREFIX)/bin $(MANDIR)/man1 - install catsh $(PREFIX)/bin + install 1sh $(PREFIX)/bin install -m 644 $(MAN1) $(MANDIR)/man1 uninstall: - rm -f $(PREFIX)/bin/catsh $(MAN1:%=$(MANDIR)/man1/%) + rm -f $(PREFIX)/bin/1sh $(MAN1:%=$(MANDIR)/man1/%) shell: - grep -q '^$(PREFIX)/bin/catsh$$' /etc/shells \ - || echo '$(PREFIX)/bin/catsh' >> /etc/shells + grep -q '^$(PREFIX)/bin/1sh$$' /etc/shells \ + || echo '$(PREFIX)/bin/1sh' >> /etc/shells unshell: - sed -i sed '\;^$(PREFIX)/bin/catsh$$;d' /etc/shells + sed -i sed '\;^$(PREFIX)/bin/1sh$$;d' /etc/shells diff --git a/bin/catsh/TOUR b/bin/1sh/TOUR index 68330af0..68330af0 100644 --- a/bin/catsh/TOUR +++ b/bin/1sh/TOUR diff --git a/bin/catsh/alias.c b/bin/1sh/alias.c index 593e7457..593e7457 100644 --- a/bin/catsh/alias.c +++ b/bin/1sh/alias.c diff --git a/bin/catsh/alias.h b/bin/1sh/alias.h index 837f1305..837f1305 100644 --- a/bin/catsh/alias.h +++ b/bin/1sh/alias.h diff --git a/bin/catsh/arith.h b/bin/1sh/arith.h index 364092fa..364092fa 100644 --- a/bin/catsh/arith.h +++ b/bin/1sh/arith.h diff --git a/bin/catsh/arith_yacc.c b/bin/1sh/arith_yacc.c index 604096aa..604096aa 100644 --- a/bin/catsh/arith_yacc.c +++ b/bin/1sh/arith_yacc.c diff --git a/bin/catsh/arith_yacc.h b/bin/1sh/arith_yacc.h index 2dc43526..2dc43526 100644 --- a/bin/catsh/arith_yacc.h +++ b/bin/1sh/arith_yacc.h diff --git a/bin/catsh/arith_yylex.c b/bin/1sh/arith_yylex.c index 0f38c878..0f38c878 100644 --- a/bin/catsh/arith_yylex.c +++ b/bin/1sh/arith_yylex.c diff --git a/bin/catsh/bltin.h b/bin/1sh/bltin.h index e9adb878..e9adb878 100644 --- a/bin/catsh/bltin.h +++ b/bin/1sh/bltin.h diff --git a/bin/catsh/builtins.def b/bin/1sh/builtins.def index b3295a9b..b3295a9b 100644 --- a/bin/catsh/builtins.def +++ b/bin/1sh/builtins.def diff --git a/bin/catsh/cd.c b/bin/1sh/cd.c index d1780b64..d1780b64 100644 --- a/bin/catsh/cd.c +++ b/bin/1sh/cd.c diff --git a/bin/catsh/cd.h b/bin/1sh/cd.h index 11de2228..11de2228 100644 --- a/bin/catsh/cd.h +++ b/bin/1sh/cd.h diff --git a/bin/catsh/echo.c b/bin/1sh/echo.c index 78c146e9..78c146e9 100644 --- a/bin/catsh/echo.c +++ b/bin/1sh/echo.c diff --git a/bin/catsh/error.c b/bin/1sh/error.c index 02680718..02680718 100644 --- a/bin/catsh/error.c +++ b/bin/1sh/error.c diff --git a/bin/catsh/error.h b/bin/1sh/error.h index 8efd5b38..8efd5b38 100644 --- a/bin/catsh/error.h +++ b/bin/1sh/error.h diff --git a/bin/catsh/eval.c b/bin/1sh/eval.c index 5a5289e1..5a5289e1 100644 --- a/bin/catsh/eval.c +++ b/bin/1sh/eval.c diff --git a/bin/catsh/eval.h b/bin/1sh/eval.h index 7bfa0216..7bfa0216 100644 --- a/bin/catsh/eval.h +++ b/bin/1sh/eval.h diff --git a/bin/catsh/exec.c b/bin/1sh/exec.c index 5026e644..5026e644 100644 --- a/bin/catsh/exec.c +++ b/bin/1sh/exec.c diff --git a/bin/catsh/exec.h b/bin/1sh/exec.h index 3b3a5b77..3b3a5b77 100644 --- a/bin/catsh/exec.h +++ b/bin/1sh/exec.h diff --git a/bin/catsh/expand.c b/bin/1sh/expand.c index 7c419b80..7c419b80 100644 --- a/bin/catsh/expand.c +++ b/bin/1sh/expand.c diff --git a/bin/catsh/expand.h b/bin/1sh/expand.h index 92e344d9..92e344d9 100644 --- a/bin/catsh/expand.h +++ b/bin/1sh/expand.h diff --git a/bin/catsh/histedit.c b/bin/1sh/histedit.c index 08339a00..08339a00 100644 --- a/bin/catsh/histedit.c +++ b/bin/1sh/histedit.c diff --git a/bin/catsh/input.c b/bin/1sh/input.c index 24ba73b5..24ba73b5 100644 --- a/bin/catsh/input.c +++ b/bin/1sh/input.c diff --git a/bin/catsh/input.h b/bin/1sh/input.h index 2a04921d..2a04921d 100644 --- a/bin/catsh/input.h +++ b/bin/1sh/input.h diff --git a/bin/catsh/jobs.c b/bin/1sh/jobs.c index 88703edd..88703edd 100644 --- a/bin/catsh/jobs.c +++ b/bin/1sh/jobs.c diff --git a/bin/catsh/jobs.h b/bin/1sh/jobs.h index 52c3abe1..52c3abe1 100644 --- a/bin/catsh/jobs.h +++ b/bin/1sh/jobs.h diff --git a/bin/catsh/kill.c b/bin/1sh/kill.c index f58987cc..f58987cc 100644 --- a/bin/catsh/kill.c +++ b/bin/1sh/kill.c diff --git a/bin/catsh/libedit/.gitignore b/bin/1sh/libedit/.gitignore index eeae3b81..eeae3b81 100644 --- a/bin/catsh/libedit/.gitignore +++ b/bin/1sh/libedit/.gitignore diff --git a/bin/catsh/libedit/Makefile b/bin/1sh/libedit/Makefile index 9b13d59d..9b13d59d 100644 --- a/bin/catsh/libedit/Makefile +++ b/bin/1sh/libedit/Makefile diff --git a/bin/catsh/libedit/chared.c b/bin/1sh/libedit/chared.c index 9d46ba68..9d46ba68 100644 --- a/bin/catsh/libedit/chared.c +++ b/bin/1sh/libedit/chared.c diff --git a/bin/catsh/libedit/chared.h b/bin/1sh/libedit/chared.h index 39f7d517..39f7d517 100644 --- a/bin/catsh/libedit/chared.h +++ b/bin/1sh/libedit/chared.h diff --git a/bin/catsh/libedit/chartype.c b/bin/1sh/libedit/chartype.c index 9288e6b7..9288e6b7 100644 --- a/bin/catsh/libedit/chartype.c +++ b/bin/1sh/libedit/chartype.c diff --git a/bin/catsh/libedit/chartype.h b/bin/1sh/libedit/chartype.h index 4cdd981d..4cdd981d 100644 --- a/bin/catsh/libedit/chartype.h +++ b/bin/1sh/libedit/chartype.h diff --git a/bin/catsh/libedit/common.c b/bin/1sh/libedit/common.c index 27086051..27086051 100644 --- a/bin/catsh/libedit/common.c +++ b/bin/1sh/libedit/common.c diff --git a/bin/catsh/libedit/config.h b/bin/1sh/libedit/config.h index 3eb35d17..3eb35d17 100644 --- a/bin/catsh/libedit/config.h +++ b/bin/1sh/libedit/config.h diff --git a/bin/catsh/libedit/editline.3 b/bin/1sh/libedit/editline.3 index a27e24ce..a27e24ce 100644 --- a/bin/catsh/libedit/editline.3 +++ b/bin/1sh/libedit/editline.3 diff --git a/bin/catsh/libedit/editline.7 b/bin/1sh/libedit/editline.7 index 863bab96..863bab96 100644 --- a/bin/catsh/libedit/editline.7 +++ b/bin/1sh/libedit/editline.7 diff --git a/bin/catsh/libedit/editrc.5 b/bin/1sh/libedit/editrc.5 index 9bc94b8b..9bc94b8b 100644 --- a/bin/catsh/libedit/editrc.5 +++ b/bin/1sh/libedit/editrc.5 diff --git a/bin/catsh/libedit/el.c b/bin/1sh/libedit/el.c index c30f50ca..c30f50ca 100644 --- a/bin/catsh/libedit/el.c +++ b/bin/1sh/libedit/el.c diff --git a/bin/catsh/libedit/el.h b/bin/1sh/libedit/el.h index 862e1976..862e1976 100644 --- a/bin/catsh/libedit/el.h +++ b/bin/1sh/libedit/el.h diff --git a/bin/catsh/libedit/eln.c b/bin/1sh/libedit/eln.c index aa0a5b56..aa0a5b56 100644 --- a/bin/catsh/libedit/eln.c +++ b/bin/1sh/libedit/eln.c diff --git a/bin/catsh/libedit/emacs.c b/bin/1sh/libedit/emacs.c index 0636c28b..0636c28b 100644 --- a/bin/catsh/libedit/emacs.c +++ b/bin/1sh/libedit/emacs.c diff --git a/bin/catsh/libedit/filecomplete.c b/bin/1sh/libedit/filecomplete.c index 6ccc2719..6ccc2719 100644 --- a/bin/catsh/libedit/filecomplete.c +++ b/bin/1sh/libedit/filecomplete.c diff --git a/bin/catsh/libedit/filecomplete.h b/bin/1sh/libedit/filecomplete.h index 61d81389..61d81389 100644 --- a/bin/catsh/libedit/filecomplete.h +++ b/bin/1sh/libedit/filecomplete.h diff --git a/bin/catsh/libedit/hist.c b/bin/1sh/libedit/hist.c index 3c9db7dc..3c9db7dc 100644 --- a/bin/catsh/libedit/hist.c +++ b/bin/1sh/libedit/hist.c diff --git a/bin/catsh/libedit/hist.h b/bin/1sh/libedit/hist.h index c58c5bfe..c58c5bfe 100644 --- a/bin/catsh/libedit/hist.h +++ b/bin/1sh/libedit/hist.h diff --git a/bin/catsh/libedit/histedit.h b/bin/1sh/libedit/histedit.h index ecb42686..ecb42686 100644 --- a/bin/catsh/libedit/histedit.h +++ b/bin/1sh/libedit/histedit.h diff --git a/bin/catsh/libedit/history.c b/bin/1sh/libedit/history.c index 005fe2a0..005fe2a0 100644 --- a/bin/catsh/libedit/history.c +++ b/bin/1sh/libedit/history.c diff --git a/bin/catsh/libedit/historyn.c b/bin/1sh/libedit/historyn.c index 59130dea..59130dea 100644 --- a/bin/catsh/libedit/historyn.c +++ b/bin/1sh/libedit/historyn.c diff --git a/bin/catsh/libedit/keymacro.c b/bin/1sh/libedit/keymacro.c index 13d20893..13d20893 100644 --- a/bin/catsh/libedit/keymacro.c +++ b/bin/1sh/libedit/keymacro.c diff --git a/bin/catsh/libedit/keymacro.h b/bin/1sh/libedit/keymacro.h index 0653bbe3..0653bbe3 100644 --- a/bin/catsh/libedit/keymacro.h +++ b/bin/1sh/libedit/keymacro.h diff --git a/bin/catsh/libedit/literal.c b/bin/1sh/libedit/literal.c index 816dc3ce..816dc3ce 100644 --- a/bin/catsh/libedit/literal.c +++ b/bin/1sh/libedit/literal.c diff --git a/bin/catsh/libedit/literal.h b/bin/1sh/libedit/literal.h index d1929505..d1929505 100644 --- a/bin/catsh/libedit/literal.h +++ b/bin/1sh/libedit/literal.h diff --git a/bin/catsh/libedit/makelist b/bin/1sh/libedit/makelist index c8f92765..c8f92765 100644 --- a/bin/catsh/libedit/makelist +++ b/bin/1sh/libedit/makelist diff --git a/bin/catsh/libedit/map.c b/bin/1sh/libedit/map.c index f72d2724..f72d2724 100644 --- a/bin/catsh/libedit/map.c +++ b/bin/1sh/libedit/map.c diff --git a/bin/catsh/libedit/map.h b/bin/1sh/libedit/map.h index b4e4e289..b4e4e289 100644 --- a/bin/catsh/libedit/map.h +++ b/bin/1sh/libedit/map.h diff --git a/bin/catsh/libedit/parse.c b/bin/1sh/libedit/parse.c index fdd0d847..fdd0d847 100644 --- a/bin/catsh/libedit/parse.c +++ b/bin/1sh/libedit/parse.c diff --git a/bin/catsh/libedit/parse.h b/bin/1sh/libedit/parse.h index fe8eb473..fe8eb473 100644 --- a/bin/catsh/libedit/parse.h +++ b/bin/1sh/libedit/parse.h diff --git a/bin/catsh/libedit/prompt.c b/bin/1sh/libedit/prompt.c index 6a63f612..6a63f612 100644 --- a/bin/catsh/libedit/prompt.c +++ b/bin/1sh/libedit/prompt.c diff --git a/bin/catsh/libedit/prompt.h b/bin/1sh/libedit/prompt.h index 2931428d..2931428d 100644 --- a/bin/catsh/libedit/prompt.h +++ b/bin/1sh/libedit/prompt.h diff --git a/bin/catsh/libedit/read.c b/bin/1sh/libedit/read.c index f9b6684d..f9b6684d 100644 --- a/bin/catsh/libedit/read.c +++ b/bin/1sh/libedit/read.c diff --git a/bin/catsh/libedit/read.h b/bin/1sh/libedit/read.h index 1acf5d67..1acf5d67 100644 --- a/bin/catsh/libedit/read.h +++ b/bin/1sh/libedit/read.h diff --git a/bin/catsh/libedit/readline.c b/bin/1sh/libedit/readline.c index bd5602de..bd5602de 100644 --- a/bin/catsh/libedit/readline.c +++ b/bin/1sh/libedit/readline.c diff --git a/bin/catsh/libedit/readline/Makefile b/bin/1sh/libedit/readline/Makefile index 265540b7..265540b7 100644 --- a/bin/catsh/libedit/readline/Makefile +++ b/bin/1sh/libedit/readline/Makefile diff --git a/bin/catsh/libedit/readline/readline.h b/bin/1sh/libedit/readline/readline.h index 777a4c6f..777a4c6f 100644 --- a/bin/catsh/libedit/readline/readline.h +++ b/bin/1sh/libedit/readline/readline.h diff --git a/bin/catsh/libedit/refresh.c b/bin/1sh/libedit/refresh.c index 37c6041d..37c6041d 100644 --- a/bin/catsh/libedit/refresh.c +++ b/bin/1sh/libedit/refresh.c diff --git a/bin/catsh/libedit/refresh.h b/bin/1sh/libedit/refresh.h index 09b22ef6..09b22ef6 100644 --- a/bin/catsh/libedit/refresh.h +++ b/bin/1sh/libedit/refresh.h diff --git a/bin/catsh/libedit/search.c b/bin/1sh/libedit/search.c index 5226cf5f..5226cf5f 100644 --- a/bin/catsh/libedit/search.c +++ b/bin/1sh/libedit/search.c diff --git a/bin/catsh/libedit/search.h b/bin/1sh/libedit/search.h index 4ca39c4c..4ca39c4c 100644 --- a/bin/catsh/libedit/search.h +++ b/bin/1sh/libedit/search.h diff --git a/bin/catsh/libedit/shlib_version b/bin/1sh/libedit/shlib_version index 303609d2..303609d2 100644 --- a/bin/catsh/libedit/shlib_version +++ b/bin/1sh/libedit/shlib_version diff --git a/bin/catsh/libedit/sig.c b/bin/1sh/libedit/sig.c index 83742a3d..83742a3d 100644 --- a/bin/catsh/libedit/sig.c +++ b/bin/1sh/libedit/sig.c diff --git a/bin/catsh/libedit/sig.h b/bin/1sh/libedit/sig.h index 5ee453fb..5ee453fb 100644 --- a/bin/catsh/libedit/sig.h +++ b/bin/1sh/libedit/sig.h diff --git a/bin/catsh/libedit/sys.h b/bin/1sh/libedit/sys.h index dc0a8cb9..dc0a8cb9 100644 --- a/bin/catsh/libedit/sys.h +++ b/bin/1sh/libedit/sys.h diff --git a/bin/catsh/libedit/terminal.c b/bin/1sh/libedit/terminal.c index edaa5b2b..edaa5b2b 100644 --- a/bin/catsh/libedit/terminal.c +++ b/bin/1sh/libedit/terminal.c diff --git a/bin/catsh/libedit/terminal.h b/bin/1sh/libedit/terminal.h index ae61beb1..ae61beb1 100644 --- a/bin/catsh/libedit/terminal.h +++ b/bin/1sh/libedit/terminal.h diff --git a/bin/catsh/libedit/tokenizer.c b/bin/1sh/libedit/tokenizer.c index 18532240..18532240 100644 --- a/bin/catsh/libedit/tokenizer.c +++ b/bin/1sh/libedit/tokenizer.c diff --git a/bin/catsh/libedit/tokenizern.c b/bin/1sh/libedit/tokenizern.c index 5846b606..5846b606 100644 --- a/bin/catsh/libedit/tokenizern.c +++ b/bin/1sh/libedit/tokenizern.c diff --git a/bin/catsh/libedit/tty.c b/bin/1sh/libedit/tty.c index f524da47..f524da47 100644 --- a/bin/catsh/libedit/tty.c +++ b/bin/1sh/libedit/tty.c diff --git a/bin/catsh/libedit/tty.h b/bin/1sh/libedit/tty.h index 2603e1ad..2603e1ad 100644 --- a/bin/catsh/libedit/tty.h +++ b/bin/1sh/libedit/tty.h diff --git a/bin/catsh/libedit/vi.c b/bin/1sh/libedit/vi.c index 0c37bfb9..0c37bfb9 100644 --- a/bin/catsh/libedit/vi.c +++ b/bin/1sh/libedit/vi.c diff --git a/bin/catsh/mail.c b/bin/1sh/mail.c index 6f8a3d39..6f8a3d39 100644 --- a/bin/catsh/mail.c +++ b/bin/1sh/mail.c diff --git a/bin/catsh/mail.h b/bin/1sh/mail.h index adeced2d..adeced2d 100644 --- a/bin/catsh/mail.h +++ b/bin/1sh/mail.h diff --git a/bin/catsh/main.c b/bin/1sh/main.c index 7a0bf25b..7a0bf25b 100644 --- a/bin/catsh/main.c +++ b/bin/1sh/main.c diff --git a/bin/catsh/main.h b/bin/1sh/main.h index f37fd99e..f37fd99e 100644 --- a/bin/catsh/main.h +++ b/bin/1sh/main.h diff --git a/bin/catsh/memalloc.c b/bin/1sh/memalloc.c index e43ce4cd..e43ce4cd 100644 --- a/bin/catsh/memalloc.c +++ b/bin/1sh/memalloc.c diff --git a/bin/catsh/memalloc.h b/bin/1sh/memalloc.h index 216275d8..216275d8 100644 --- a/bin/catsh/memalloc.h +++ b/bin/1sh/memalloc.h diff --git a/bin/catsh/miscbltin.c b/bin/1sh/miscbltin.c index 7f0c42e7..7f0c42e7 100644 --- a/bin/catsh/miscbltin.c +++ b/bin/1sh/miscbltin.c diff --git a/bin/catsh/mkbuiltins b/bin/1sh/mkbuiltins index 32c09ec0..32c09ec0 100755 --- a/bin/catsh/mkbuiltins +++ b/bin/1sh/mkbuiltins diff --git a/bin/catsh/mknodes.c b/bin/1sh/mknodes.c index cdc615fc..cdc615fc 100644 --- a/bin/catsh/mknodes.c +++ b/bin/1sh/mknodes.c diff --git a/bin/catsh/mksyntax.c b/bin/1sh/mksyntax.c index a023da60..a023da60 100644 --- a/bin/catsh/mksyntax.c +++ b/bin/1sh/mksyntax.c diff --git a/bin/catsh/mktokens b/bin/1sh/mktokens index da6ae962..da6ae962 100644 --- a/bin/catsh/mktokens +++ b/bin/1sh/mktokens diff --git a/bin/catsh/myhistedit.h b/bin/1sh/myhistedit.h index 6eebe521..6eebe521 100644 --- a/bin/catsh/myhistedit.h +++ b/bin/1sh/myhistedit.h diff --git a/bin/catsh/mystring.c b/bin/1sh/mystring.c index a96d4fa5..a96d4fa5 100644 --- a/bin/catsh/mystring.c +++ b/bin/1sh/mystring.c diff --git a/bin/catsh/mystring.h b/bin/1sh/mystring.h index f4fc9af4..f4fc9af4 100644 --- a/bin/catsh/mystring.h +++ b/bin/1sh/mystring.h diff --git a/bin/catsh/nodes.c.pat b/bin/1sh/nodes.c.pat index eeb82737..eeb82737 100644 --- a/bin/catsh/nodes.c.pat +++ b/bin/1sh/nodes.c.pat diff --git a/bin/catsh/nodetypes b/bin/1sh/nodetypes index 0bb29c8e..0bb29c8e 100644 --- a/bin/catsh/nodetypes +++ b/bin/1sh/nodetypes diff --git a/bin/catsh/options.c b/bin/1sh/options.c index 422c0f19..422c0f19 100644 --- a/bin/catsh/options.c +++ b/bin/1sh/options.c diff --git a/bin/catsh/options.h b/bin/1sh/options.h index 1242b095..1242b095 100644 --- a/bin/catsh/options.h +++ b/bin/1sh/options.h diff --git a/bin/catsh/output.c b/bin/1sh/output.c index 1eb8b692..1eb8b692 100644 --- a/bin/catsh/output.c +++ b/bin/1sh/output.c diff --git a/bin/catsh/output.h b/bin/1sh/output.h index 511c7078..511c7078 100644 --- a/bin/catsh/output.h +++ b/bin/1sh/output.h diff --git a/bin/catsh/parser.c b/bin/1sh/parser.c index 377ab78f..377ab78f 100644 --- a/bin/catsh/parser.c +++ b/bin/1sh/parser.c diff --git a/bin/catsh/parser.h b/bin/1sh/parser.h index bc86f7e4..bc86f7e4 100644 --- a/bin/catsh/parser.h +++ b/bin/1sh/parser.h diff --git a/bin/catsh/printf.c b/bin/1sh/printf.c index e698c417..e698c417 100644 --- a/bin/catsh/printf.c +++ b/bin/1sh/printf.c diff --git a/bin/catsh/redir.c b/bin/1sh/redir.c index 616053cf..616053cf 100644 --- a/bin/catsh/redir.c +++ b/bin/1sh/redir.c diff --git a/bin/catsh/redir.h b/bin/1sh/redir.h index 8c171423..8c171423 100644 --- a/bin/catsh/redir.h +++ b/bin/1sh/redir.h diff --git a/bin/catsh/shell.h b/bin/1sh/shell.h index 5e3d60dc..5e3d60dc 100644 --- a/bin/catsh/shell.h +++ b/bin/1sh/shell.h diff --git a/bin/catsh/show.c b/bin/1sh/show.c index e8a55886..e8a55886 100644 --- a/bin/catsh/show.c +++ b/bin/1sh/show.c diff --git a/bin/catsh/show.h b/bin/1sh/show.h index 587c5ada..587c5ada 100644 --- a/bin/catsh/show.h +++ b/bin/1sh/show.h diff --git a/bin/catsh/test.c b/bin/1sh/test.c index a153cdb3..a153cdb3 100644 --- a/bin/catsh/test.c +++ b/bin/1sh/test.c diff --git a/bin/catsh/trap.c b/bin/1sh/trap.c index 93c063e1..93c063e1 100644 --- a/bin/catsh/trap.c +++ b/bin/1sh/trap.c diff --git a/bin/catsh/trap.h b/bin/1sh/trap.h index 2898c594..2898c594 100644 --- a/bin/catsh/trap.h +++ b/bin/1sh/trap.h diff --git a/bin/catsh/var.c b/bin/1sh/var.c index 435d3307..83e48732 100644 --- a/bin/catsh/var.c +++ b/bin/1sh/var.c @@ -111,10 +111,10 @@ int forcelocal; #define XDG_DATA_HOME "${XDG_DATA_HOME:-${HOME}/.local/share}" static const struct varinit varinit[] = { - { &venv, 0, "ENV=" XDG_CONFIG_HOME "/catsh/env.sh", + { &venv, 0, "ENV=" XDG_CONFIG_HOME "/1sh/env.sh", NULL }, #ifndef NO_HISTORY - { &vhistfile, 0, "HISTFILE=" XDG_DATA_HOME "/catsh/history", + { &vhistfile, 0, "HISTFILE=" XDG_DATA_HOME "/1sh/history", sethistfile }, { &vhistsize, VUNSET, "HISTSIZE=", sethistsize }, diff --git a/bin/catsh/var.h b/bin/1sh/var.h index 1e6420fd..1e6420fd 100644 --- a/bin/catsh/var.h +++ b/bin/1sh/var.h |