toybox: toys/toysh.c annotate

annotate toys/toysh.c @ 194:30a6db5a95c2

Add comments about SUSv3 specs (or lack thereof).

author	Rob Landley <rob@landley.net>
date	Mon, 03 Dec 2007 20:05:57 -0600
parents	25447caf1b4b
children	3227c5316260

rev	line source
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	1 /* vi: set sw=4 ts=4:
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 146 diff changeset	2 *
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	3 * toysh - toybox shell
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	4 *
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	5 * 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	6 *
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	7 * The spec for this is at:
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	8 * http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
194 30a6db5a95c2 Add comments about SUSv3 specs (or lack thereof). Rob Landley <rob@landley.net> parents: 186 diff changeset	9 * and
30a6db5a95c2 Add comments about SUSv3 specs (or lack thereof). Rob Landley <rob@landley.net> parents: 186 diff changeset	10 * http://www.opengroup.org/onlinepubs/007904975/utilities/sh.html
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	11 *
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	12 * Although things like the bash man page are good to read too.
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	13 */
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	14
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	15 // Handle embedded NUL bytes in the command line.
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	16
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	17 #include "toys.h"
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	18
146 99e651512aa4 Get toysh.c to start using the option parsing logic, and some minor cleanup. Rob Landley <rob@landley.net> parents: 121 diff changeset	19 #define TT toy.toysh
99e651512aa4 Get toysh.c to start using the option parsing logic, and some minor cleanup. Rob Landley <rob@landley.net> parents: 121 diff changeset	20
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	21 // A single executable, its arguments, and other information we know about it.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	22 #define TOYSH_FLAG_EXIT 1
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	23 #define TOYSH_FLAG_SUSPEND 2
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	24 #define TOYSH_FLAG_PIPE 4
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	25 #define TOYSH_FLAG_AND 8
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	26 #define TOYSH_FLAG_OR 16
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	27 #define TOYSH_FLAG_AMP 32
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	28 #define TOYSH_FLAG_SEMI 64
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	29 #define TOYSH_FLAG_PAREN 128
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	30
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	31 // What we know about a single process.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	32 struct command {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	33 struct command *next;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	34 int flags; // exit, suspend, && \|\|
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	35 int pid; // pid (or exit code)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	36 int argc;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	37 char *argv[0];
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	38 };
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	39
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	40 // A collection of processes piped into/waiting on each other.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	41 struct pipeline {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	42 struct pipeline *next;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	43 int job_id;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	44 struct command *cmd;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	45 char *cmdline; // Unparsed line for display purposes
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	46 int cmdlinelen; // How long is cmdline?
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	47 };
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	48
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	49 // 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	50 // to struct command. Handles environment variable substitution and
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	51 // 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	52 // hit an ending token.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	53 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	54 {
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	55 char *end;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	56
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	57 // Detect end of line (and truncate line at comment)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	58 if (CFG_TOYSH_PIPES && strchr("><&\|(;", *start)) return 0;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	59
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	60 // Grab next word. (Add dequote and envvar logic here)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	61 end = start;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	62 while (end && !isspace(end)) end++;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	63 (cmd)->argv[(cmd)->argc++] = xstrndup(start, end-start);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	64
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	65 // 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	66
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	67 if (!((*cmd)->argc & 7))
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 90 diff changeset	68 cmd=xrealloc(cmd,
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	69 sizeof(struct command) + ((cmd)->argc+8)sizeof(char *));
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	70 (cmd)->argv[(cmd)->argc] = 0;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	71 return end;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	72 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	73
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	74 // Parse a line of text into a pipeline.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	75 // Returns a pointer to the next line.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	76
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	77 static char parse_pipeline(char cmdline, struct pipeline *line)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	78 {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	79 struct command **cmd = &(line->cmd);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	80 char *start = line->cmdline = cmdline;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	81
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	82 if (!cmdline) return 0;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	83
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	84 if (CFG_TOYSH_JOBCTL) 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	85
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	86 // Parse command into argv[]
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	87 for (;;) {
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	88 char *end;
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 146 diff changeset	89
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	90 // Skip leading whitespace and detect end of line.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	91 while (isspace(*start)) start++;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	92 if (!start \|\| start=='#') {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	93 if (CFG_TOYSH_JOBCTL) line->cmdlinelen = start-cmdline;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	94 return 0;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	95 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	96
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	97 // Allocate next command structure if necessary
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	98 if (!cmd) cmd = xzalloc(sizeof(struct command)+8sizeof(char ));
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	99
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	100 // Parse next argument and add the results to argv[]
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	101 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	102
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	103 // If we hit the end of this command, how did it end?
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	104 if (!end) {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	105 if (CFG_TOYSH_PIPES && *start) {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	106 if (*start==';') {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	107 start++;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	108 break;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	109 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	110 // handle \| & < > >> << \|\| &&
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	111 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	112 break;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	113 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	114 start = end;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	115 }
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	116
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	117 if (CFG_TOYSH_JOBCTL) line->cmdlinelen = start-cmdline;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	118
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	119 return start;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	120 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	121
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	122 // Execute the commands in a pipeline
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	123 static void run_pipeline(struct pipeline *line)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	124 {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	125 struct toy_list *tl;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	126 struct command *cmd = line->cmd;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	127 if (!cmd \|\| !cmd->argc) return;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	128
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	129 tl = toy_find(cmd->argv[0]);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	130 // Is this command a builtin that should run in this process?
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	131 if (tl && (tl->flags & TOYFLAG_NOFORK)) {
25 eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	132 struct toy_context temp;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	133
25 eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	134 // This fakes lots of what toybox_main() does.
eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	135 memcpy(&temp, &toys, sizeof(struct toy_context));
eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	136 bzero(&toys, sizeof(struct toy_context));
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	137 toy_init(tl, cmd->argv);
186 25447caf1b4b Change command main() functions to return void, and exit(toys.exitval) from Rob Landley <rob@landley.net> parents: 165 diff changeset	138 tl->toy_main();
25447caf1b4b Change command main() functions to return void, and exit(toys.exitval) from Rob Landley <rob@landley.net> parents: 165 diff changeset	139 cmd->pid = toys.exitval;
25 eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	140 free(toys.optargs);
eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	141 memcpy(&toys, &temp, sizeof(struct toy_context));
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	142 } else {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	143 int status;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	144
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	145 cmd->pid = vfork();
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	146 if (!cmd->pid) xexec(cmd->argv);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	147 else waitpid(cmd->pid, &status, 0);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	148
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	149 if (CFG_TOYSH_FLOWCTL \|\| CFG_TOYSH_PIPES) {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	150 if (WIFEXITED(status)) cmd->pid = WEXITSTATUS(status);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	151 if (WIFSIGNALED(status)) cmd->pid = WTERMSIG(status);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	152 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	153 }
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	154
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	155 return;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	156 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	157
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	158 // Free the contents of a command structure
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	159 static void free_cmd(void *data)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	160 {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	161 struct command cmd=(struct command )data;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	162
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	163 while(cmd->argc) free(cmd->argv[--cmd->argc]);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	164 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	165
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	166
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	167 // 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	168 static void handle(char *command)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	169 {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	170 struct pipeline line;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	171 char *start = command;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	172
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	173 // Loop through commands in this line
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	174
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	175 for (;;) {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	176
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	177 // Parse a group of connected commands
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	178
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	179 memset(&line,0,sizeof(struct pipeline));
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	180 start = parse_pipeline(start, &line);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	181 if (!line.cmd) break;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	182
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	183 // Run those commands
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	184
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	185 run_pipeline(&line);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	186 llist_free(line.cmd, free_cmd);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	187 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	188 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	189
186 25447caf1b4b Change command main() functions to return void, and exit(toys.exitval) from Rob Landley <rob@landley.net> parents: 165 diff changeset	190 void cd_main(void)
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	191 {
121 933766b0bd4b Allow applets with optarg string NULL to use toy.optargs[]. Rob Landley <rob@landley.net> parents: 115 diff changeset	192 char dest = toys.optargs ? *toys.optargs : getenv("HOME");
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	193 if (chdir(dest)) error_exit("chdir %s",dest);
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	194 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	195
186 25447caf1b4b Change command main() functions to return void, and exit(toys.exitval) from Rob Landley <rob@landley.net> parents: 165 diff changeset	196 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	197 {
121 933766b0bd4b Allow applets with optarg string NULL to use toy.optargs[]. Rob Landley <rob@landley.net> parents: 115 diff changeset	198 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	199 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	200
186 25447caf1b4b Change command main() functions to return void, and exit(toys.exitval) from Rob Landley <rob@landley.net> parents: 165 diff changeset	201 void toysh_main(void)
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	202 {
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	203 FILE *f;
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	204
25 eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	205 // Set up signal handlers and grab control of this tty.
eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	206 if (CFG_TOYSH_TTY) {
eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	207 if (isatty(0)) toys.optflags \|= 1;
eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	208 }
121 933766b0bd4b Allow applets with optarg string NULL to use toy.optargs[]. Rob Landley <rob@landley.net> parents: 115 diff changeset	209 f = toys.optargs ? xfopen(toys.optargs, "r") : NULL;
146 99e651512aa4 Get toysh.c to start using the option parsing logic, and some minor cleanup. Rob Landley <rob@landley.net> parents: 121 diff changeset	210 if (TT.command) handle(TT.command);
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	211 else {
165 ad48dca1f4c5 Zap a warning. Rob Landley <rob@landley.net> parents: 156 diff changeset	212 size_t cmdlen = 0;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	213 for (;;) {
146 99e651512aa4 Get toysh.c to start using the option parsing logic, and some minor cleanup. Rob Landley <rob@landley.net> parents: 121 diff changeset	214 char *command = 0;
186 25447caf1b4b Change command main() functions to return void, and exit(toys.exitval) from Rob Landley <rob@landley.net> parents: 165 diff changeset	215 if (!f) xputc('$');
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	216 if (1 > getline(&command, &cmdlen, f ? : stdin)) break;
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	217 handle(command);
146 99e651512aa4 Get toysh.c to start using the option parsing logic, and some minor cleanup. Rob Landley <rob@landley.net> parents: 121 diff changeset	218 free(command);
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	219 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	220 }
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 146 diff changeset	221
186 25447caf1b4b Change command main() functions to return void, and exit(toys.exitval) from Rob Landley <rob@landley.net> parents: 165 diff changeset	222 toys.exitval = 1;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	223 }

Mercurial > hg > toybox

annotate toys/toysh.c @ 194:30a6db5a95c2