Merge pull request #140 from eelvi/strncmp-fix

fixed strncmp.
insane-adding-machines · Nov 14, 2017 · 2f64d64 · 2f64d64
2 parents 60360ae + 1732f24
commit 2f64d64
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/kernel/string.c b/kernel/string.c
@@ -106,17 +106,9 @@ int strncmp(const char *s1, const char *s2, size_t n)
     int diff = 0;
 
     while (n > 0) {
-        if (!s1) {
-            diff = 0 - (int)*s2;
-        } else if (!s2) {
-            diff = (int)*s1;
-        } else {
-            diff = (int)*s1 - (int)*s2;
-        }
-
-        if (diff)
+        diff = (unsigned char)*s1 - (unsigned char)*s2;
+        if (diff || !*s1)
             break;
-
         s1++;
         s2++;
         n--;