1 files changed, 12 insertions, 27 deletions

diff --git a/networking/ftpd.c b/networking/ftpd.c
index 0d6a289c7..c3125410e 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -190,54 +190,39 @@ struct globals {
 } while (0)
 
 
+/* escape_text("pfx:", str, (0xff << 8) + '\r')
+ * Duplicate 0xff, append \r ^^^^^^^^^^^^^^^^^^
+ */
 static char *
 escape_text(const char *prepend, const char *str, unsigned escapee)
 {
-        unsigned retlen, remainlen, chunklen;
-        char *ret, *found;
+        char *ret, *p;
         char append;
 
         append = (char)escapee;
         escapee >>= 8;
 
-        remainlen = strlen(str);
-        retlen = strlen(prepend);
-        ret = xmalloc(retlen + remainlen * 2 + 1 + 1);
-        strcpy(ret, prepend);
+        ret = xmalloc(strlen(prepend) + strlen(str) * 2 + 1 + 1);
+        p = stpcpy(ret, prepend);
 
         for (;;) {
-                found = strchrnul(str, escapee);
-                chunklen = found - str + 1;
+                char *found = strchrnul(str, escapee);
 
-                /* Copy chunk up to and including escapee (or NUL) to ret */
-                memcpy(ret + retlen, str, chunklen);
-                retlen += chunklen;
+                /* Copy up to and including escapee (or NUL) */
+                p = mempcpy(p, str, found - str + 1);
 
                 if (*found == '\0') {
                         /* It wasn't escapee, it was NUL! */
-                        ret[retlen - 1] = append; /* replace NUL */
-                        ret[retlen] = '\0'; /* add NUL */
                         break;
                 }
-                ret[retlen++] = escapee; /* duplicate escapee */
                 str = found + 1;
+                *p++ = escapee; /* duplicate escapee */
         }
+        p[-1] = append; /* replace NUL */
+        *p = '\0'; /* add NUL */
         return ret;
 }
 
-/* Returns strlen as a bonus */
-static unsigned
-replace_char(char *str, char from, char to)
-{
-        char *p = str;
-        while (*p) {
-                if (*p == from)
-                        *p = to;
-                p++;
-        }
-        return p - str;
-}
-
 static void
 verbose_log(const char *str)
 {