summaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-07-17 01:12:36 +0000
committerEric Andersen <andersen@codepoet.org>2001-07-17 01:12:36 +0000
commit044228d5ecb9b79397f9fc915d046cf4538281e2 (patch)
tree4c43e4947b0196d807249f8f6e1c9c679b6bbcde /shell/ash.c
parent51ded05b3bf4df6f126420d39a40d27ea0728aa9 (diff)
downloadbusybox-w32-044228d5ecb9b79397f9fc915d046cf4538281e2.tar.gz
busybox-w32-044228d5ecb9b79397f9fc915d046cf4538281e2.tar.bz2
busybox-w32-044228d5ecb9b79397f9fc915d046cf4538281e2.zip
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.c7
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:
6204 if (!iflag) 6204 if (!iflag)
6205 nr = safe_read(parsefile->fd, buf, BUFSIZ - 1); 6205 nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
6206 else { 6206 else {
6207 cmdedit_read_input((char*)cmdedit_prompt, buf); 6207 nr = cmdedit_read_input((char*)cmdedit_prompt, buf);
6208 nr = strlen(buf);
6209 } 6208 }
6210 } 6209 }
6211#else 6210#else
@@ -9445,7 +9444,7 @@ static char *wordtext; /* text of last word returned by readtok
9445 9444
9446static struct nodelist *backquotelist; 9445static struct nodelist *backquotelist;
9447static union node *redirnode; 9446static union node *redirnode;
9448struct heredoc *heredoc; 9447static struct heredoc *heredoc;
9449static int quoteflag; /* set if (part of) last token was quoted */ 9448static int quoteflag; /* set if (part of) last token was quoted */
9450static int startlinno; /* line # where last token started */ 9449static int startlinno; /* line # where last token started */
9451 9450
@@ -12917,7 +12916,7 @@ findvar(struct var **vpp, const char *name)
12917/* 12916/*
12918 * Copyright (c) 1999 Herbert Xu <herbert@debian.org> 12917 * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
12919 * This file contains code for the times builtin. 12918 * This file contains code for the times builtin.
12920 * $Id: ash.c,v 1.10 2001/07/12 20:26:31 andersen Exp $ 12919 * $Id: ash.c,v 1.11 2001/07/17 01:12:35 andersen Exp $
12921 */ 12920 */
12922static int timescmd (int argc, char **argv) 12921static int timescmd (int argc, char **argv)
12923{ 12922{