#include <sys/wait.h>
#include <unistd.h>
#include <getopt.h>
+
+#ifdef BB_LOCALE_SUPPORT
#include <locale.h>
+#endif
//#define BB_FEATURE_SH_WORDEXP
#include "cmdedit.h"
-static const int MAX_LINE = 256; /* size of input buffer for cwd data */
static const int MAX_READ = 128; /* size of input buffer for `read' builtin */
#define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n"
#endif
static char *PS1;
-static char *PS2;
+static char *PS2 = "> ";
#ifdef DEBUG_SHELL
printf("cd: %s: %m\n", newdir);
return EXIT_FAILURE;
}
- getcwd(cwd, sizeof(char)*MAX_LINE);
+ cwd = xgetcwd(cwd);
return EXIT_SUCCESS;
}
/* built-in 'pwd' handler */
static int builtin_pwd(struct child_prog *dummy)
{
- getcwd(cwd, MAX_LINE);
printf( "%s\n", cwd);
return EXIT_SUCCESS;
}
for (e = environ; *e; e++) {
printf( "%s\n", *e);
}
+ return 0;
}
res = putenv(v);
if (res)
#ifndef BB_FEATURE_SH_SIMPLE_PROMPT
if (strncmp(v, "PS1=", 4)==0)
PS1 = getenv("PS1");
- else if (strncmp(v, "PS2=", 4)==0)
- PS2 = getenv("PS2");
#endif
+
+#ifdef BB_LOCALE_SUPPORT
if(strncmp(v, "LC_ALL=", 7)==0)
setlocale(LC_ALL, getenv("LC_ALL"));
if(strncmp(v, "LC_CTYPE=", 9)==0)
setlocale(LC_CTYPE, getenv("LC_CTYPE"));
+#endif
return (res);
}
*/
static int run_command_predicate(char *cmd)
{
- int n=strlen(cmd);
- local_pending_command = xmalloc(n+1);
- strncpy(local_pending_command, cmd, n);
- local_pending_command[n]='\0';
+ local_pending_command = xstrdup(cmd);
return( busy_loop(NULL));
}
#endif
{
#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
PS1 = NULL;
- PS2 = "> ";
#else
PS1 = getenv("PS1");
- if(PS1==0) {
+ if(PS1==0)
PS1 = "\\w \\$ ";
- }
- PS2 = getenv("PS2");
- if(PS2==0)
- PS2 = "> ";
#endif
}
/* Fix up escape sequences to be the Real Thing(tm) */
while( command && command[ix]) {
if (command[ix] == '\\') {
- char *tmp = command+ix+1;
+ const char *tmp = command+ix+1;
command[ix] = process_escape_sequence( &tmp );
memmove(command+ix + 1, tmp, strlen(tmp)+1);
}
int argc_l = 0;
int done = 0;
int argv_alloced;
- int i;
+ int i, saw_quote = 0;
char quote = '\0';
int count;
struct child_prog *prog;
*src == ']') *buf++ = '\\';
*buf++ = *src;
} else if (isspace(*src)) {
- if (*prog->argv[argc_l]) {
+ if (*prog->argv[argc_l] || saw_quote) {
buf++, argc_l++;
/* +1 here leaves room for the NULL which ends argv */
if ((argc_l + 1) == argv_alloced) {
argv_alloced);
}
prog->argv[argc_l] = buf;
+ saw_quote = 0;
}
} else
switch (*src) {
case '"':
case '\'':
quote = *src;
+ saw_quote = 1;
break;
case '#': /* comment */
case '|': /* pipe */
/* finish this command */
- if (*prog->argv[argc_l])
+ if (*prog->argv[argc_l] || saw_quote)
argc_l++;
if (!argc_l) {
error_msg("empty command in pipe");
src++;
}
- if (*prog->argv[argc_l]) {
+ if (*prog->argv[argc_l] || saw_quote) {
argc_l++;
}
if (!argc_l) {
#ifdef BB_FEATURE_CLEAN_UP
void free_memory(void)
{
- if (cwd)
+ if (cwd) {
free(cwd);
+ cwd = NULL;
+ }
if (local_pending_command)
free(local_pending_command);
/* These variables need re-initializing when recursing */
shell_context = 0;
- cwd=NULL;
local_pending_command = NULL;
close_me_head = NULL;
job_list.head = NULL;
if (interactive==TRUE) {
//printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
/* Looks like they want an interactive shell */
- printf( "\n\nBusyBox v%s (%s) Built-in shell (lash)\n", BB_VER, BB_BT);
+ printf( "\n\n" BB_BANNER " Built-in shell (lash)\n");
printf( "Enter 'help' for a list of built-in commands.\n\n");
} else if (local_pending_command==NULL) {
//printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
}
/* initialize the cwd -- this is never freed...*/
- cwd=(char*)xmalloc(sizeof(char)*MAX_LINE+1);
- getcwd(cwd, sizeof(char)*MAX_LINE);
+ cwd = xgetcwd(0);
#ifdef BB_FEATURE_CLEAN_UP
atexit(free_memory);
cmdedit_set_initial_prompt();
#else
PS1 = NULL;
- PS2 = "> ";
#endif
return (busy_loop(input));