Index: zipscript/src/datacleaner.c
===================================================================
--- zipscript/src/datacleaner.c (revision 2110)
+++ zipscript/src/datacleaner.c (working copy)
@@ -99,7 +99,7 @@

        dir = opendir(path);
        while ((dp = readdir(dir))) {
-               if (dp->d_name[0] != '.' || (dp->d_name[0] == '.' && dp->d_namlen > 2)) {
+               if (dp->d_name[0] != '.' || (dp->d_name[0] == '.' && strlen(dp->d_name) > 2)) {
                        stat(dp->d_name, &sb);
                        if (S_ISDIR(sb.st_mode)) {
                                sprintf(target, "%s/%s", path, dp->d_name);
Index: zipscript/src/ng-chown.c
===================================================================
--- zipscript/src/ng-chown.c    (revision 2102)
+++ zipscript/src/ng-chown.c    (working copy)
@@ -277,9 +277,9 @@
                                while (f_buf[m] != ':' && m > l_start)
                                        m--;
 #if (change_spaces_to_underscore_in_ng_chown)
-                               if ((m != i) && !strcmp(u_name, u_modname)){
+                               if ((m != i) && m == (int)strlen(u_modname) && !strcmp(u_name, u_modname)) {
 #else
-                               if ((m != i) && !strcmp(u_name, user_name)){
+                               if ((m != i) && m == (int)strlen(user_name) && !strcmp(u_name, user_name)) {
 #endif
                                        u_id = strtol(f_buf + m + 1, NULL, 10);
                                        break;