[PATCH] remove "#if 1" from shell/hush.c
Robert P. J. Day
rpjday at mindspring.com
Sat Mar 25 14:14:22 PST 2006
diff -pru busybox.orig/shell/hush.c busybox/shell/hush.c
--- busybox.orig/shell/hush.c 2006-03-25 17:07:04.000000000 -0500
+++ busybox/shell/hush.c 2006-03-25 17:10:56.000000000 -0500
@@ -96,16 +96,9 @@
/* #include <dmalloc.h> */
/* #define DEBUG_SHELL */
-#if 1
#include "busybox.h"
#include "cmdedit.h"
-#else
-#define bb_applet_name "hush"
-//#include "standalone.h"
-#define hush_main main
-#undef CONFIG_FEATURE_SH_FANCY_PROMPT
-#define BB_BANNER ""
-#endif
+
#define SPECIAL_VAR_SYMBOL 03
#define FLAG_EXIT_FROM_LOOP 1
#define FLAG_PARSE_SEMICOLON (1 << 1) /* symbol ';' is special for parser */
@@ -2246,7 +2239,6 @@ static int redirect_opt_num(o_string *o)
static FILE *generate_stream_from_list(struct pipe *head)
{
FILE *pf;
-#if 1
int pid, channel[2];
if (pipe(channel)<0) bb_perror_msg_and_die("pipe");
#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
@@ -2274,11 +2266,6 @@ static FILE *generate_stream_from_list(s
close(channel[1]);
pf = fdopen(channel[0],"r");
debug_printf("pipe on FILE *%p\n",pf);
-#else
- free_pipe_list(head,0);
- pf=popen("echo surrogate response","r");
- debug_printf("started fake pipe on FILE *%p\n",pf);
-#endif
return pf;
}
Signed off by: Robert P. J. Day <rpjday at mindspring.com>
More information about the busybox
mailing list