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.)

1 files changed, 2 insertions, 2 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 5031ae153..c1b2b0ed6 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;