aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpjday <rpjday@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-01 12:19:39 +0000
committerrpjday <rpjday@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-01 12:19:39 +0000
commitea53f07609c70d06a50e076acd53f74420ced836 (patch)
tree608f6f65d89a3aaa3ed607055fdb65946329d3c1
parentc675ec2fbfe09e03dd2319aaeb644984ebca7795 (diff)
downloadbusybox-w32-ea53f07609c70d06a50e076acd53f74420ced836.tar.gz
busybox-w32-ea53f07609c70d06a50e076acd53f74420ced836.tar.bz2
busybox-w32-ea53f07609c70d06a50e076acd53f74420ced836.zip
Remove "#if 1" directives.
git-svn-id: svn://busybox.net/trunk/busybox@15567 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--shell/hush.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 1f4e2e833..13a992fc2 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -98,15 +98,8 @@
98/* #include <dmalloc.h> */ 98/* #include <dmalloc.h> */
99/* #define DEBUG_SHELL */ 99/* #define DEBUG_SHELL */
100 100
101#if 1
102#include "cmdedit.h" 101#include "cmdedit.h"
103#else 102
104#define bb_applet_name "hush"
105//#include "standalone.h"
106#define hush_main main
107#undef CONFIG_FEATURE_SH_FANCY_PROMPT
108#define BB_BANNER ""
109#endif
110#define SPECIAL_VAR_SYMBOL 03 103#define SPECIAL_VAR_SYMBOL 03
111#define FLAG_EXIT_FROM_LOOP 1 104#define FLAG_EXIT_FROM_LOOP 1
112#define FLAG_PARSE_SEMICOLON (1 << 1) /* symbol ';' is special for parser */ 105#define FLAG_PARSE_SEMICOLON (1 << 1) /* symbol ';' is special for parser */
@@ -2247,7 +2240,6 @@ static int redirect_opt_num(o_string *o)
2247static FILE *generate_stream_from_list(struct pipe *head) 2240static FILE *generate_stream_from_list(struct pipe *head)
2248{ 2241{
2249 FILE *pf; 2242 FILE *pf;
2250#if 1
2251 int pid, channel[2]; 2243 int pid, channel[2];
2252 if (pipe(channel)<0) bb_perror_msg_and_die("pipe"); 2244 if (pipe(channel)<0) bb_perror_msg_and_die("pipe");
2253#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__) 2245#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
@@ -2275,11 +2267,6 @@ static FILE *generate_stream_from_list(struct pipe *head)
2275 close(channel[1]); 2267 close(channel[1]);
2276 pf = fdopen(channel[0],"r"); 2268 pf = fdopen(channel[0],"r");
2277 debug_printf("pipe on FILE *%p\n",pf); 2269 debug_printf("pipe on FILE *%p\n",pf);
2278#else
2279 free_pipe_list(head,0);
2280 pf=popen("echo surrogate response","r");
2281 debug_printf("started fake pipe on FILE *%p\n",pf);
2282#endif
2283 return pf; 2270 return pf;
2284} 2271}
2285 2272