toybox: toys/pending/sh.c annotate

annotate toys/pending/sh.c @ 1391:6a06541c090c draft

Use libc daemon() instead of pending daemonize.

author	Rob Landley <rob@landley.net>
date	Thu, 17 Jul 2014 22:50:49 -0500
parents	1fa185766188
children	5fac2769a159

rev	line source
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	1 /* sh.c - toybox shell
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	2 *
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	3 * Copyright 2006 Rob Landley <rob@landley.net>
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	4 *
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	5 * The POSIX-2008/SUSv4 spec for this is at:
656 6df4ccc0acbe Regularize command headers, update links to standards documents. Rob Landley <rob@landley.net> parents: 655 diff changeset	6 * http://opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html
6df4ccc0acbe Regularize command headers, update links to standards documents. Rob Landley <rob@landley.net> parents: 655 diff changeset	7 * and http://opengroup.org/onlinepubs/9699919799/utilities/sh.html
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	8 *
e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	9 * The first link describes the following shell builtins:
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	10 *
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	11 * break colon continue dot eval exec exit export readonly return set shift
e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	12 * times trap unset
e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	13 *
e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	14 * The second link (the utilities directory) also contains specs for the
e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	15 * following shell builtins:
e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	16 *
e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	17 * alias bg cd command fc fg getopts hash jobs kill read type ulimit
e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	18 * umask unalias wait
198 3227c5316260 Update links and add some more spec comments. Rob Landley <rob@landley.net> parents: 194 diff changeset	19 *
3227c5316260 Update links and add some more spec comments. Rob Landley <rob@landley.net> parents: 194 diff changeset	20 * Things like the bash man page are good to read too.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	21 *
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	22 * TODO: // Handle embedded NUL bytes in the command line.
d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	23
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	24 USE_SH(NEWTOY(cd, NULL, TOYFLAG_NOFORK))
e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	25 USE_SH(NEWTOY(exit, NULL, TOYFLAG_NOFORK))
234 163498bf547b Move NEWTOY() list from end of toylist.h to generated/newtoys.h. Rob Landley <rob@landley.net> parents: 233 diff changeset	26
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	27 USE_SH(NEWTOY(sh, "c:"USE_SH_INTERACTIVE("i"), TOYFLAG_BIN))
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	28 USE_SH(OLDTOY(toysh, sh, OPTSTR_sh, TOYFLAG_BIN))
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	29
e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	30 config SH
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	31 bool "sh (toysh)"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	32 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	33 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	34 usage: sh [-c command] [script]
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	35
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	36 Command shell. Runs a shell script, or reads input interactively
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	37 and responds to it.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	38
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	39 -c command line to execute
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	40
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	41 config SH_INTERACTIVE
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	42 bool "Interactive shell"
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	43 default n
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	44 depends on SH
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	45 help
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	46 This shell supports terminal control (so the shell isn't killed by CTRL-C),
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	47 job control (fg, bg, jobs), and reads /etc/profile and ~/.profile when
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	48 running interactively.
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	49
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	50 -i interactive mode (default when STDIN is a tty)
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	51
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	52 config EXIT
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	53 bool
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	54 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	55 depends on SH
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	56 help
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	57 usage: exit [status]
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	58
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	59 Exit shell. If no return value supplied on command line, use value
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	60 of most recent command, or 0 if none.
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	61
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	62 config CD
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	63 bool
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	64 default n
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	65 depends on SH
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	66 help
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	67 usage: cd [-PL] [path]
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	68
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	69 Change current directory. With no arguments, go $HOME.
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	70
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	71 -P Physical path: resolve symlinks in path.
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	72 -L Local path: .. trims directories off $PWD (default).
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	73 */
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	74
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	75 /*
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	76 This level of micromanagement is silly, it adds more complexity than it's
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	77 worth. (Not just to the code, but decision fatigue configuring it.)
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	78
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	79 That said, the following list is kept for the moment as a todo list of
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	80 features I need to implement.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	81
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	82 config SH_PROFILE
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	83 bool "Profile support"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	84 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	85 depends on SH_TTY
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	86 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	87 Read /etc/profile and ~/.profile when running interactively.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	88
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	89 Also enables the built-in command "source".
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	90
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	91 config SH_JOBCTL
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	92 bool "Job Control (fg, bg, jobs)"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	93 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	94 depends on SH_TTY
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	95 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	96 Add job control to toysh. This lets toysh handle CTRL-Z, and enables
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	97 the built-in commands "fg", "bg", and "jobs".
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	98
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	99 With pipe support, enable use of "&" to run background processes.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	100
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	101 config SH_FLOWCTL
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	102 bool "Flow control (if, while, for, functions)"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	103 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	104 depends on SH
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	105 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	106 Add flow control to toysh. This enables the if/then/else/fi,
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	107 while/do/done, and for/do/done constructs.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	108
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	109 With pipe support, this enables the ability to define functions
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	110 using the "function name" or "name()" syntax, plus curly brackets
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	111 "{ }" to group commands.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	112
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	113 config SH_QUOTES
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	114 bool "Smarter argument parsing (quotes)"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	115 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	116 depends on SH
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	117 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	118 Add support for parsing "" and '' style quotes to the toysh command
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	119 parser, with lets arguments have spaces in them.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	120
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	121 config SH_WILDCARDS
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	122 bool "Wildcards ( ?*{,} )"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	123 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	124 depends on SH_QUOTES
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	125 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	126 Expand wildcards in argument names, ala "ls -l *.t?z" and
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	127 "rm subdir/{one,two,three}.txt".
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	128
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	129 config SH_PROCARGS
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	130 bool "Executable arguments ( `` and $() )"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	131 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	132 depends on SH_QUOTES
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	133 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	134 Add support for executing arguments contianing $() and ``, using
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	135 the output of the command as the new argument value(s).
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	136
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	137 (Bash calls this "command substitution".)
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	138
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	139 config SH_ENVVARS
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	140 bool "Environment variable support"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	141 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	142 depends on SH_QUOTES
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	143 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	144 Substitute environment variable values for $VARNAME or ${VARNAME},
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	145 and enable the built-in command "export".
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	146
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	147 config SH_LOCALS
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	148 bool "Local variables"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	149 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	150 depends on SH_ENVVARS
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	151 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	152 Support for local variables, fancy prompts ($PS1), the "set" command,
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	153 and $?.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	154
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	155 config SH_ARRAYS
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	156 bool "Array variables"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	157 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	158 depends on SH_LOCALS
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	159 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	160 Support for ${blah[blah]} style array variables.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	161
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	162 config SH_PIPES
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	163 bool "Pipes and redirects ( \| > >> < << & && \| \|\| () ; )"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	164 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	165 depends on SH
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	166 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	167 Support multiple commands on the same command line. This includes
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	168 \| pipes, > >> < redirects, << here documents, \|\| && conditional
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	169 execution, () subshells, ; sequential execution, and (with job
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	170 control) & background processes.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	171
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	172 config SH_BUILTINS
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	173 bool "Builtin commands"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	174 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	175 depends on SH
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	176 help
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	177 Adds the commands exec, fg, bg, help, jobs, pwd, export, source, set,
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	178 unset, read, alias.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 198 diff changeset	179 */
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	180
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 659 diff changeset	181 #define FOR_sh
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	182 #include "toys.h"
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	183
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 659 diff changeset	184 GLOBALS(
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	185 char *command;
237 7cb15eae1664 Zap toylist.h, moving contents of global structures into DEFINE_GLOBALS() Rob Landley <rob@landley.net> parents: 234 diff changeset	186 )
7cb15eae1664 Zap toylist.h, moving contents of global structures into DEFINE_GLOBALS() Rob Landley <rob@landley.net> parents: 234 diff changeset	187
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	188 // A single executable, its arguments, and other information we know about it.
659 f142928f144a Roy Tam pointed out that sh.c didn't get fully converted. Rob Landley <rob@landley.net> parents: 656 diff changeset	189 #define SH_FLAG_EXIT 1
f142928f144a Roy Tam pointed out that sh.c didn't get fully converted. Rob Landley <rob@landley.net> parents: 656 diff changeset	190 #define SH_FLAG_SUSPEND 2
f142928f144a Roy Tam pointed out that sh.c didn't get fully converted. Rob Landley <rob@landley.net> parents: 656 diff changeset	191 #define SH_FLAG_PIPE 4
f142928f144a Roy Tam pointed out that sh.c didn't get fully converted. Rob Landley <rob@landley.net> parents: 656 diff changeset	192 #define SH_FLAG_AND 8
f142928f144a Roy Tam pointed out that sh.c didn't get fully converted. Rob Landley <rob@landley.net> parents: 656 diff changeset	193 #define SH_FLAG_OR 16
f142928f144a Roy Tam pointed out that sh.c didn't get fully converted. Rob Landley <rob@landley.net> parents: 656 diff changeset	194 #define SH_FLAG_AMP 32
f142928f144a Roy Tam pointed out that sh.c didn't get fully converted. Rob Landley <rob@landley.net> parents: 656 diff changeset	195 #define SH_FLAG_SEMI 64
f142928f144a Roy Tam pointed out that sh.c didn't get fully converted. Rob Landley <rob@landley.net> parents: 656 diff changeset	196 #define SH_FLAG_PAREN 128
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	197
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	198 // What we know about a single process.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	199 struct command {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	200 struct command *next;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	201 int flags; // exit, suspend, && \|\|
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	202 int pid; // pid (or exit code)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	203 int argc;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	204 char *argv[0];
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	205 };
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	206
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	207 // A collection of processes piped into/waiting on each other.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	208 struct pipeline {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	209 struct pipeline *next;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	210 int job_id;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	211 struct command *cmd;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	212 char *cmdline; // Unparsed line for display purposes
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	213 int cmdlinelen; // How long is cmdline?
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	214 };
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	215
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	216 // Parse one word from the command line, appending one or more argv[] entries
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	217 // to struct command. Handles environment variable substitution and
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	218 // substrings. Returns pointer to next used byte, or NULL if it
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	219 // hit an ending token.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	220 static char parse_word(char start, struct command **cmd)
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	221 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	222 char *end;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	223
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	224 // Detect end of line (and truncate line at comment)
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	225 if (strchr("><&\|(;", *start)) return 0;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	226
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	227 // Grab next word. (Add dequote and envvar logic here)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	228 end = start;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	229 while (end && !isspace(end)) end++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	230 (cmd)->argv[(cmd)->argc++] = xstrndup(start, end-start);
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	231
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	232 // Allocate more space if there's no room for NULL terminator.
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	233
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	234 if (!((*cmd)->argc & 7))
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	235 cmd=xrealloc(cmd,
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	236 sizeof(struct command) + ((cmd)->argc+8)sizeof(char *));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	237 (cmd)->argv[(cmd)->argc] = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	238 return end;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	239 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	240
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	241 // Parse a line of text into a pipeline.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	242 // Returns a pointer to the next line.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	243
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	244 static char parse_pipeline(char cmdline, struct pipeline *line)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	245 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	246 struct command **cmd = &(line->cmd);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	247 char *start = line->cmdline = cmdline;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	248
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	249 if (!cmdline) return 0;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	250
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	251 if (CFG_SH_INTERACTIVE) line->cmdline = cmdline;
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 146 diff changeset	252
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	253 // Parse command into argv[]
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	254 for (;;) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	255 char *end;
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 146 diff changeset	256
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	257 // Skip leading whitespace and detect end of line.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	258 while (isspace(*start)) start++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	259 if (!start \|\| start=='#') {
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	260 if (CFG_SH_INTERACTIVE) line->cmdlinelen = start-cmdline;
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	261 return 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	262 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	263
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	264 // Allocate next command structure if necessary
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	265 if (!cmd) cmd = xzalloc(sizeof(struct command)+8sizeof(char ));
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	266
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	267 // Parse next argument and add the results to argv[]
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	268 end = parse_word(start, cmd);
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	269
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	270 // If we hit the end of this command, how did it end?
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	271 if (!end) {
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	272 if (*start) {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	273 if (*start==';') {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	274 start++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	275 break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	276 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	277 // handle \| & < > >> << \|\| &&
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	278 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	279 break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	280 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	281 start = end;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	282 }
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	283
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	284 if (CFG_SH_INTERACTIVE) line->cmdlinelen = start-cmdline;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	285
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	286 return start;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	287 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	288
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	289 // Execute the commands in a pipeline
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	290 static void run_pipeline(struct pipeline *line)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	291 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	292 struct toy_list *tl;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	293 struct command *cmd = line->cmd;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	294 if (!cmd \|\| !cmd->argc) return;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	295
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	296 tl = toy_find(cmd->argv[0]);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	297 // Is this command a builtin that should run in this process?
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	298 if (tl && (tl->flags & TOYFLAG_NOFORK)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	299 struct toy_context temp;
696 99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	300 jmp_buf rebound;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	301
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	302 // This fakes lots of what toybox_main() does.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	303 memcpy(&temp, &toys, sizeof(struct toy_context));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	304 memset(&toys, 0, sizeof(struct toy_context));
696 99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	305
99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	306 if (!setjmp(rebound)) {
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	307 toys.rebound = &rebound;
696 99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	308 toy_init(tl, cmd->argv);
99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	309 tl->toy_main();
99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	310 }
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	311 cmd->pid = toys.exitval;
777 85e5097c49c1 Fix invalid free in toysh. Felix Janda <felix.janda@posteo.de> parents: 696 diff changeset	312 if (toys.optargs != toys.argv+1) free(toys.optargs);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	313 if (toys.old_umask) umask(toys.old_umask);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	314 memcpy(&toys, &temp, sizeof(struct toy_context));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	315 } else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	316 int status;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	317
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	318 cmd->pid = vfork();
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	319 if (!cmd->pid) xexec(cmd->argv);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	320 else waitpid(cmd->pid, &status, 0);
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	321
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	322 if (WIFEXITED(status)) cmd->pid = WEXITSTATUS(status);
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	323 if (WIFSIGNALED(status)) cmd->pid = WTERMSIG(status);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	324 }
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	325
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	326 return;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	327 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	328
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	329 // Free the contents of a command structure
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	330 static void free_cmd(void *data)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	331 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	332 struct command cmd=(struct command )data;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	333
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	334 while(cmd->argc) free(cmd->argv[--cmd->argc]);
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	335 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	336
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	337
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	338 // Parse a command line and do what it says to do.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	339 static void handle(char *command)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	340 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	341 struct pipeline line;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	342 char *start = command;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	343
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	344 // Loop through commands in this line
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	345
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	346 for (;;) {
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	347
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	348 // Parse a group of connected commands
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	349
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	350 memset(&line,0,sizeof(struct pipeline));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	351 start = parse_pipeline(start, &line);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	352 if (!line.cmd) break;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	353
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	354 // Run those commands
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	355
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	356 run_pipeline(&line);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	357 llist_traverse(line.cmd, free_cmd);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	358 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	359 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	360
186 25447caf1b4b Change command main() functions to return void, and exit(toys.exitval) from Rob Landley <rob@landley.net> parents: 165 diff changeset	361 void cd_main(void)
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	362 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	363 char dest = toys.optargs ? *toys.optargs : getenv("HOME");
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	364
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	365 xchdir(dest ? dest : "/");
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	366 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	367
186 25447caf1b4b Change command main() functions to return void, and exit(toys.exitval) from Rob Landley <rob@landley.net> parents: 165 diff changeset	368 void exit_main(void)
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 146 diff changeset	369 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	370 exit(toys.optargs ? atoi(toys.optargs) : 0);
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	371 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	372
655 e235d7d575e5 Toysh is our posix sh, so move from "other" to "posix" and use sh as the base command name. Rob Landley <rob@landley.net> parents: 653 diff changeset	373 void sh_main(void)
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	374 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	375 FILE *f;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	376
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	377 // Set up signal handlers and grab control of this tty.
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	378 if (CFG_SH_INTERACTIVE && isatty(0)) toys.optflags \|= FLAG_i;
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	379
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	380 f = toys.optargs ? xfopen(toys.optargs, "r") : NULL;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	381 if (TT.command) handle(TT.command);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	382 else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	383 size_t cmdlen = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	384 for (;;) {
1319 1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	385 char prompt = getenv("PS1"), command = 0;
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	386
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	387 // TODO: parse escapes in prompt
1fa185766188 Brush the dust off toysh. Rob Landley <rob@landley.net> parents: 803 diff changeset	388 if (!f) printf("%s", prompt ? prompt : "$ ");
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	389 if (1 > getline(&command, &cmdlen, f ? f : stdin)) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	390 handle(command);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	391 free(command);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	392 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	393 }
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 146 diff changeset	394
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	395 toys.exitval = 1;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	396 }

Mercurial > hg > toybox

annotate toys/pending/sh.c @ 1391:6a06541c090c draft