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/ash.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/ash.c')
| -rw-r--r-- | shell/ash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index 5031ae1..c1b2b0e 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -6011,7 +6011,7 @@ static inline void putprompt(const char *s) { #ifdef CONFIG_ASH_EXPAND_PRMT free(cmdedit_prompt); - cmdedit_prompt = bb_xstrdup(s); + cmdedit_prompt = xstrdup(s); #else cmdedit_prompt = s; #endif @@ -8105,7 +8105,7 @@ static int dotcmd(int argc, char **argv) int status = 0; for (sp = cmdenviron; sp; sp = sp->next) - setvareq(bb_xstrdup(sp->text), VSTRFIXED | VTEXTFIXED); + setvareq(xstrdup(sp->text), VSTRFIXED | VTEXTFIXED); if (argc >= 2) { /* That's what SVR2 does */ char *fullname; |