2 files changed, 21 insertions, 5 deletions

diff --git a/apps/plugins/lua/ltablib.c b/apps/plugins/lua/ltablib.c
index b6d9cb4ac7..0bdac7f6c5 100644
--- a/apps/plugins/lua/ltablib.c
+++ b/apps/plugins/lua/ltablib.c
@@ -137,7 +137,7 @@ static void addfield (lua_State *L, luaL_Buffer *b, int i) {
   if (!lua_isstring(L, -1))
     luaL_error(L, "invalid value (%s) at index %d in table for "
                   LUA_QL("concat"), luaL_typename(L, -1), i);
-    luaL_addvalue(b);
+  luaL_addvalue(b);
 }
 
 
diff --git a/apps/plugins/lua/strncat.c b/apps/plugins/lua/strncat.c
index 5b15ff07b1..147397440a 100644
--- a/apps/plugins/lua/strncat.c
+++ b/apps/plugins/lua/strncat.c
@@ -8,11 +8,27 @@ char *strncat(char *s, const char *t, size_t n) {
   s+=strlen(s);
   if (__unlikely((max=s+n)==s)) goto fini;
   for (;;) {
-    if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t;
+    if (__unlikely(!(*s = *t)))
+        break;
+    if (__unlikely(++s==max))
+        break;
+    ++t;
 #ifndef WANT_SMALL_STRING_ROUTINES
-    if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t;
-    if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t;
-    if (__unlikely(!(*s = *t))) break; if (__unlikely(++s==max)) break; ++t;
+    if (__unlikely(!(*s = *t)))
+        break;
+    if (__unlikely(++s==max))
+        break;
+    ++t;
+    if (__unlikely(!(*s = *t)))
+        break;
+    if (__unlikely(++s==max))
+        break;
+    ++t;
+    if (__unlikely(!(*s = *t)))
+        break;
+    if (__unlikely(++s==max))
+        break;
+    ++t;
 #endif
   }
   *s=0;