diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-07-17 01:12:36 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-07-17 01:12:36 +0000 |
| commit | 044228d5ecb9b79397f9fc915d046cf4538281e2 (patch) | |
| tree | 4c43e4947b0196d807249f8f6e1c9c679b6bbcde /shell/ash.c | |
| parent | 51ded05b3bf4df6f126420d39a40d27ea0728aa9 (diff) | |
| download | busybox-044228d5ecb9b79397f9fc915d046cf4538281e2.tar.gz | |
This is vodz' latest patch. Sorry it took so long...
1) ping cleanup (compile fix from this patch already applied).
2) traceroute call not spare ntohl() now (and reduce size);
3) Fix for functions not declared static in insmod, ash, vi and mount.
4) a more simple API cmdedit :))
5) adds "stopped jobs" warning to ash on Ctrl-D and fixes "ignoreeof" option
6) reduce exporting library function index->strchr (traceroute), bzero->memset (syslogd)
Diffstat (limited to 'shell/ash.c')
| -rw-r--r-- | shell/ash.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/shell/ash.c b/shell/ash.c index 334d2fddd..d16da82db 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -6204,8 +6204,7 @@ retry: if (!iflag) nr = safe_read(parsefile->fd, buf, BUFSIZ - 1); else { - cmdedit_read_input((char*)cmdedit_prompt, buf); - nr = strlen(buf); + nr = cmdedit_read_input((char*)cmdedit_prompt, buf); } } #else @@ -9445,7 +9444,7 @@ static char *wordtext; /* text of last word returned by readtok static struct nodelist *backquotelist; static union node *redirnode; -struct heredoc *heredoc; +static struct heredoc *heredoc; static int quoteflag; /* set if (part of) last token was quoted */ static int startlinno; /* line # where last token started */ @@ -12917,7 +12916,7 @@ findvar(struct var **vpp, const char *name) /* * Copyright (c) 1999 Herbert Xu <herbert@debian.org> * This file contains code for the times builtin. - * $Id: ash.c,v 1.10 2001/07/12 20:26:31 andersen Exp $ + * $Id: ash.c,v 1.11 2001/07/17 01:12:35 andersen Exp $ */ static int timescmd (int argc, char **argv) { |