Merge pull request #1369 from Mellvik/misc

[kernel][libc] Fix memcmp
ghaerr · Jul 14, 2022 · 06503d8 · 06503d8
2 parents e59601c + 0feb214
commit 06503d8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/elks/arch/i86/drivers/char/eth.c b/elks/arch/i86/drivers/char/eth.c
@@ -8,6 +8,7 @@
 #include <linuxmt/errno.h>
 #include <linuxmt/fs.h>
 #include <linuxmt/netstat.h>
+#include <linuxmt/string.h>
 
 /* character devices and their minor numbers */
 extern struct file_operations ne2k_fops;    /* 0 CONFIG_ETH_NE2K */

diff --git a/elks/lib/string.c b/elks/lib/string.c
@@ -226,7 +226,7 @@ int memcmp(const void *s1, const void *s2, size_t n)
     char res = 0;
 
     for (; n > 0; n--)
-        if (!(res = *su1++ - *su2++))
+        if ((res = *su1++ - *su2++))
             break;
 
     return res;

diff --git a/elkscmd/file_utils/cmp.c b/elkscmd/file_utils/cmp.c
@@ -112,7 +112,7 @@ int main(int argc, char **argv)
 			pos++;
 
 		errmsg("Files differ at byte position ");
-		char *p = ltoa(pos);
+		char *p = ltoa(pos+1);
 		errstr(p);
 		errmsg("\n");
 		return 1;

diff --git a/libc/string/memcmp.c b/libc/string/memcmp.c
@@ -8,7 +8,7 @@ memcmp(const void *s1, const void *s2, size_t n)
     char res = 0;
 
     for (; n > 0; n--)
-        if (!(res = *su1++ - *su2++))
+	if ((res = *su1++ - *su2++))
             break;
 
     return res;