toybox: toys/toysh.c annotate

annotate toys/toysh.c @ 165:ad48dca1f4c5

Zap a warning.

author	Rob Landley <rob@landley.net>
date	Thu, 15 Nov 2007 20:52:01 -0600
parents	1e8f4b05cb65
children	25447caf1b4b

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
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	9 *
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	10 * 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	11 */
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	12
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	13 // 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	14
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	15 #include "toys.h"
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	16
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	17 #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	18
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	19 // 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	20 #define TOYSH_FLAG_EXIT 1
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	21 #define TOYSH_FLAG_SUSPEND 2
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	22 #define TOYSH_FLAG_PIPE 4
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	23 #define TOYSH_FLAG_AND 8
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	24 #define TOYSH_FLAG_OR 16
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	25 #define TOYSH_FLAG_AMP 32
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	26 #define TOYSH_FLAG_SEMI 64
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	27 #define TOYSH_FLAG_PAREN 128
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	28
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	29 // What we know about a single process.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	30 struct command {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	31 struct command *next;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	32 int flags; // exit, suspend, && \|\|
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	33 int pid; // pid (or exit code)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	34 int argc;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	35 char *argv[0];
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	36 };
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	37
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	38 // A collection of processes piped into/waiting on each other.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	39 struct pipeline {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	40 struct pipeline *next;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	41 int job_id;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	42 struct command *cmd;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	43 char *cmdline; // Unparsed line for display purposes
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	44 int cmdlinelen; // How long is cmdline?
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	45 };
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	46
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	47 // 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	48 // to struct command. Handles environment variable substitution and
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	49 // 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	50 // hit an ending token.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	51 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	52 {
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	53 char *end;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	54
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	55 // Detect end of line (and truncate line at comment)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	56 if (CFG_TOYSH_PIPES && strchr("><&\|(;", *start)) return 0;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	57
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	58 // Grab next word. (Add dequote and envvar logic here)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	59 end = start;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	60 while (end && !isspace(end)) end++;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	61 (cmd)->argv[(cmd)->argc++] = xstrndup(start, end-start);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	62
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	63 // 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	64
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	65 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	66 cmd=xrealloc(cmd,
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	67 sizeof(struct command) + ((cmd)->argc+8)sizeof(char *));
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	68 (cmd)->argv[(cmd)->argc] = 0;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	69 return end;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	70 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	71
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	72 // Parse a line of text into a pipeline.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	73 // Returns a pointer to the next line.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	74
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	75 static char parse_pipeline(char cmdline, struct pipeline *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 struct command **cmd = &(line->cmd);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	78 char *start = line->cmdline = cmdline;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	79
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	80 if (!cmdline) return 0;
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 (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	83
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	84 // Parse command into argv[]
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	85 for (;;) {
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	86 char *end;
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 146 diff changeset	87
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	88 // Skip leading whitespace and detect end of line.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	89 while (isspace(*start)) start++;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	90 if (!start \|\| start=='#') {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	91 if (CFG_TOYSH_JOBCTL) line->cmdlinelen = start-cmdline;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	92 return 0;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	93 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	94
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	95 // Allocate next command structure if necessary
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	96 if (!cmd) cmd = xzalloc(sizeof(struct command)+8sizeof(char ));
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	97
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	98 // Parse next argument and add the results to argv[]
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	99 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	100
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	101 // 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	102 if (!end) {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	103 if (CFG_TOYSH_PIPES && *start) {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	104 if (*start==';') {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	105 start++;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	106 break;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	107 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	108 // handle \| & < > >> << \|\| &&
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 break;
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 start = end;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	113 }
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	114
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	115 if (CFG_TOYSH_JOBCTL) line->cmdlinelen = start-cmdline;
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 return start;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	118 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	119
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	120 // Execute the commands in a pipeline
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	121 static void run_pipeline(struct pipeline *line)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	122 {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	123 struct toy_list *tl;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	124 struct command *cmd = line->cmd;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	125 if (!cmd \|\| !cmd->argc) return;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	126
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	127 tl = toy_find(cmd->argv[0]);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	128 // 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	129 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	130 struct toy_context temp;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	131
25 eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	132 // 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	133 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	134 bzero(&toys, sizeof(struct toy_context));
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	135 toy_init(tl, cmd->argv);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	136 cmd->pid = tl->toy_main();
25 eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	137 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	138 memcpy(&toys, &temp, sizeof(struct toy_context));
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	139 } else {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	140 int status;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	141
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	142 cmd->pid = vfork();
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	143 if (!cmd->pid) xexec(cmd->argv);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	144 else waitpid(cmd->pid, &status, 0);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	145
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	146 if (CFG_TOYSH_FLOWCTL \|\| CFG_TOYSH_PIPES) {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	147 if (WIFEXITED(status)) cmd->pid = WEXITSTATUS(status);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	148 if (WIFSIGNALED(status)) cmd->pid = WTERMSIG(status);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	149 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	150 }
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	151
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	152 return;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	153 }
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 // Free the contents of a command structure
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	156 static void free_cmd(void *data)
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 struct command cmd=(struct command )data;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	159
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	160 while(cmd->argc) free(cmd->argv[--cmd->argc]);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	161 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	162
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	163
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	164 // 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	165 static void handle(char *command)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	166 {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	167 struct pipeline line;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	168 char *start = 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 // Loop through commands in this line
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	171
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	172 for (;;) {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	173
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	174 // Parse a group of connected commands
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	175
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	176 memset(&line,0,sizeof(struct pipeline));
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	177 start = parse_pipeline(start, &line);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	178 if (!line.cmd) break;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	179
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	180 // Run those commands
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	181
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	182 run_pipeline(&line);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	183 llist_free(line.cmd, free_cmd);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	184 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	185 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	186
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	187 int cd_main(void)
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	188 {
121 933766b0bd4b Allow applets with optarg string NULL to use toy.optargs[]. Rob Landley <rob@landley.net> parents: 115 diff changeset	189 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	190 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	191 return 0;
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	192 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	193
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	194 int 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	195 {
121 933766b0bd4b Allow applets with optarg string NULL to use toy.optargs[]. Rob Landley <rob@landley.net> parents: 115 diff changeset	196 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	197 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	198
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	199 int toysh_main(void)
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	200 {
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	201 FILE *f;
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	202
25 eb46bb5626cb New option parsing infrastructure (doesn't use getopt). Hook it up to Rob Landley <rob@landley.net> parents: 7 diff changeset	203 // 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	204 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	205 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	206 }
121 933766b0bd4b Allow applets with optarg string NULL to use toy.optargs[]. Rob Landley <rob@landley.net> parents: 115 diff changeset	207 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	208 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	209 else {
165 ad48dca1f4c5 Zap a warning. Rob Landley <rob@landley.net> parents: 156 diff changeset	210 size_t cmdlen = 0;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	211 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	212 char *command = 0;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	213 if (!f) putchar('$');
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	214 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	215 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	216 free(command);
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	217 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	218 }
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 146 diff changeset	219
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	220 return 1;
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	221 }

Mercurial > hg > toybox

annotate toys/toysh.c @ 165:ad48dca1f4c5