diff options
| author | Rob Landley | 2006-08-03 15:41:12 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-08-03 15:41:12 +0000 |
| commit | d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch) | |
| tree | e4a2769349867c441cf2983d83097bb66701a733 /shell/hush.c | |
| parent | 6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff) | |
| download | busybox-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.zip busybox-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.gz | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c index 8c43294..8df91a1 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -1320,7 +1320,7 @@ static int run_pipe_real(struct pipe *pi) * variable. */ int export_me=0; char *name, *value; - name = bb_xstrdup(child->argv[i]); + name = xstrdup(child->argv[i]); debug_printf("Local environment set: %s\n", name); value = strchr(name, '='); if (value) @@ -2753,7 +2753,7 @@ int hush_main(int argc, char **argv) debug_printf("\nrunning script '%s'\n", argv[optind]); global_argv = argv+optind; global_argc = argc-optind; - input = bb_xfopen(argv[optind], "r"); + input = xfopen(argv[optind], "r"); opt = parse_file_outer(input); #ifdef CONFIG_FEATURE_CLEAN_UP |