Merge branch 'busybox' into merge

2 files changed, 2 insertions, 5 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 43f92bfae..bb8ac53d6 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -1384,7 +1384,7 @@ static void dbg_show_dirtymem(const char *msg)
         p = buf;
         for (;;) {
                 char *e = strchrnul(p, '\n');
-                if (strncmp(p, "Private_Dirty:", 14) == 0) {
+                if (is_prefixed_with(p, "Private_Dirty:")) {
                         p = skip_whitespace(p + 14);
                         bb_error_msg("%s:%.*s", msg, (int)(e - p), p);
                         break;
diff --git a/shell/hush.c b/shell/hush.c
index da0db7948..23e7f512f 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2941,12 +2941,9 @@ static void i_prepend_to_alias_buffer(struct in_str *i, char *prepend, char ch)
                  * a
                  * ^^^ runs "echo A: c"
                  */
-                char *old = i->albuf;
                 //bb_error_msg("before'%s' p'%s'", i->albuf, i->p);
-                i->albuf = xasprintf("%s%c%s", prepend, ch, i->p);
-                i->p = i->albuf;
+                i->p = xasprintf_inplace(i->albuf, "%s%c%s", prepend, ch, i->p);
                 //bb_error_msg("after'%s' p'%s'", i->albuf, i->p);
-                free(old);
                 return;
         }
         i->saved_ibuf = i->p;