summaryrefslogtreecommitdiff
path: root/shell/hush.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-08-03 15:41:12 +0000
committerRob Landley <rob@landley.net>2006-08-03 15:41:12 +0000
commitd921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch)
treee4a2769349867c441cf2983d83097bb66701a733 /shell/hush.c
parent6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff)
downloadbusybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.gz
busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.bz2
busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.zip
Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate
things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only had one user), clean up lots of #includes... General cleanup pass. What I've been doing for the last couple days. And it conflicts! I've removed httpd.c from this checkin due to somebody else touching that file. It builds for me. I have to catch a bus. (Now you know why I'm looking forward to Mercurial.)
Diffstat (limited to 'shell/hush.c')
-rw-r--r--shell/hush.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 8c432942e..8df91a1e8 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1320,7 +1320,7 @@ static int run_pipe_real(struct pipe *pi)
1320 * variable. */ 1320 * variable. */
1321 int export_me=0; 1321 int export_me=0;
1322 char *name, *value; 1322 char *name, *value;
1323 name = bb_xstrdup(child->argv[i]); 1323 name = xstrdup(child->argv[i]);
1324 debug_printf("Local environment set: %s\n", name); 1324 debug_printf("Local environment set: %s\n", name);
1325 value = strchr(name, '='); 1325 value = strchr(name, '=');
1326 if (value) 1326 if (value)
@@ -2753,7 +2753,7 @@ int hush_main(int argc, char **argv)
2753 debug_printf("\nrunning script '%s'\n", argv[optind]); 2753 debug_printf("\nrunning script '%s'\n", argv[optind]);
2754 global_argv = argv+optind; 2754 global_argv = argv+optind;
2755 global_argc = argc-optind; 2755 global_argc = argc-optind;
2756 input = bb_xfopen(argv[optind], "r"); 2756 input = xfopen(argv[optind], "r");
2757 opt = parse_file_outer(input); 2757 opt = parse_file_outer(input);
2758 2758
2759#ifdef CONFIG_FEATURE_CLEAN_UP 2759#ifdef CONFIG_FEATURE_CLEAN_UP