accumulated post-1.4.0 fixes

1 files changed, 4 insertions, 3 deletions

diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 4252e7646..f6b904f78 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -81,13 +81,14 @@ char * xstrndup(const char *s, int n)
         t = (char*) s;
         while (m) {
                 if (!*t) break;
-                m--; t++;
+                m--;
+                t++;
         }
-        n = n - m;
+        n -= m;
         t = xmalloc(n + 1);
         t[n] = '\0';
 
-        return memcpy(t,s,n);
+        return memcpy(t, s, n);
 }
 
 // Die if we can't open a file and return a FILE * to it.