[prev in list] [next in list] [prev in thread] [next in thread]
List: busybox-cvs
Subject: [BusyBox-cvs] busybox.stable cmdedit.h, 1.12, 1.13 cmdedit.c, 1.69, 1.70 ash.c, 1.46, 1.47
From: andersen () busybox ! net (Erik Andersen)
Date: 2003-12-23 14:27:05
Message-ID: 20031223212704.679A0B40CF () codepoet ! org
[Download RAW message or body]
Update of /var/cvs/busybox.stable
In directory nail:/tmp/cvs-serv7389
Modified Files:
cmdedit.h cmdedit.c ash.c
Log Message:
Backport the latest ash and cmdedit updates from the 1.0.0-pre series
Index: cmdedit.c
===================================================================
RCS file: /var/cvs/busybox.stable/cmdedit.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- cmdedit.c 23 Dec 2003 20:11:25 -0000 1.69
+++ cmdedit.c 23 Dec 2003 21:26:49 -0000 1.70
@@ -2,14 +2,14 @@
/*
* Termios command line History and Editting.
*
- * Copyright (c) 1986-2001 may safely be consumed by a BSD or GPL license.
+ * Copyright (c) 1986-2003 may safely be consumed by a BSD or GPL license.
* Written by: Vladimir Oleynik <dzo@simtreas.ru>
*
* Used ideas:
* Adam Rogoyski <rogoyski@cs.utexas.edu>
* Dave Cinege <dcinege@psychosis.com>
* Jakub Jelinek (c) 1995
[...1194 lines suppressed...]
- l = strlen(buff);
- if(l==0)
- break;
- if(l > 0 && buff[l-1] == '\n')
+ l = cmdedit_read_input(prompt, buff);
+ if(l > 0 && buff[l-1] == '\n') {
buff[l-1] = 0;
- printf("*** cmdedit_read_input() returned line =%s=\n", buff);
+ printf("*** cmdedit_read_input() returned line =%s=\n", buff);
+ } else {
+ break;
+ }
}
- printf("*** cmdedit_read_input() detect ^C\n");
+ printf("*** cmdedit_read_input() detect ^D\n");
return 0;
}
-#endif /* TEST */
+#endif /* TEST */
Index: ash.c
===================================================================
RCS file: /var/cvs/busybox.stable/ash.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ash.c 9 Oct 2003 02:05:31 -0000 1.46
+++ ash.c 23 Dec 2003 21:26:49 -0000 1.47
@@ -5,6 +5,10 @@
* Copyright (c) 1989, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
+ * Copyright (c) 1997-2003 Herbert Xu <herbert@debian.org>
+ * was re-ported from NetBSD and debianized.
+ *
+ *
* This code is derived from software contributed to Berkeley by
* Kenneth Almquist.
*
@@ -22,56 +26,90 @@
[...18775 lines suppressed...]
+
+ prologue:
+ ++expr;
+ }
+ }
}
-#endif
+#endif /* BB_ASH_MATH_SUPPORT */
+#ifdef DEBUG
+const char *bb_applet_name = "debug stuff usage";
+int main(int argc, char **argv)
+{
+ return ash_main(argc, argv);
+}
+#endif
/*-
* Copyright (c) 1989, 1991, 1993, 1994
Index: cmdedit.h
===================================================================
RCS file: /var/cvs/busybox.stable/cmdedit.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cmdedit.h 17 Jul 2001 01:12:36 -0000 1.12
+++ cmdedit.h 23 Dec 2003 21:26:49 -0000 1.13
@@ -3,4 +3,9 @@
int cmdedit_read_input(char* promptStr, char* command);
+#ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY
+void load_history ( const char *fromfile );
+void save_history ( const char *tofile );
+#endif
+
#endif /* CMDEDIT_H */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic