src/unistd/src/getopt.rs

@@ -69,10 +69,10 @@ unsafe fn parse_arg(
 
     let print_error = |desc: &[u8]| {
         // NOTE: we don't use fprintf to get around the usage of va_list
-        stdio::fputs(*argv as _, &mut *stdio::stderr);
-        stdio::fputs(desc.as_ptr() as _, &mut *stdio::stderr);
-        stdio::fputc(*current_arg as _, &mut *stdio::stderr);
-        stdio::fputc(b'\n' as _, &mut *stdio::stderr);
+        stdio::fputs(*argv as _, &mut *stdio::__stderr());
+        stdio::fputs(desc.as_ptr() as _, &mut *stdio::__stderr());
+        stdio::fputc(*current_arg as _, &mut *stdio::__stderr());
+        stdio::fputc(b'\n' as _, &mut *stdio::__stderr());
     };
 
     match find_option(*current_arg, optstring) {

tests/.gitignore

@@ -17,20 +17,23 @@
 /getid
 /getc_unget
 /link
+/locale
 /math
 /mem
 /pipe
 /printf
 /rmdir
 /rename
+/scanf
 /setid
-/setid
+/setjmp
 /sleep
 /sprintf
 /stdlib/a64l
 /stdlib/bsearch
 /stdlib/rand
 /stdlib/strtol
+/stdlib/strtoul
 /stdlib/a64l
 /stdio/fwrite
 /stdio/all
@@ -49,3 +52,5 @@
 /waitpid
 /write
 /time
+/gmtime
+/asctime

tests/Makefile

@@ -15,12 +15,15 @@ EXPECT_BINS=\
 	getid \
 	getc_unget \
 	link \
+	locale \
 	math \
 	mem \
 	pipe \
 	printf \
 	rename \
 	rmdir \
+	scanf \
+	setjmp \
 	sleep \
 	sprintf \
 	stdio/fwrite \
@@ -28,6 +31,7 @@ EXPECT_BINS=\
 	stdio/freopen \
 	stdlib/bsearch \
 	stdlib/strtol \
+	stdlib/strtoul \
 	stdlib/a64l \
 	stdlib/rand \
 	string/strncmp \
@@ -43,7 +47,9 @@ EXPECT_BINS=\
 	unlink \
 	waitpid \
 	write \
-	time
+	time \
+	gmtime \
+	asctime
 
 # Binaries that may generate varied output
 BINS=\

tests/asctime.c

+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int main(int argc, char** argv) {
+    time_t a = 0;
+    tm *time_info = gmtime(&a);
+
+    char *time_string = asctime(time_info);
+
+    if (time_string == NULL || strcmp(time_string, "Thu Jan  1 00:00:00 1970\n") != 0) {
+        exit(1);
+    }
+    return 0;
+}

tests/expected/locale.stdout

+success!

tests/expected/scanf.stdout

+success!

tests/expected/setjmp.stdout

+jumping...
+hi from jump

tests/gmtime.c

+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int main(int argc, char** argv) {
+    time_t a = 0;
+    tm expected = { .tm_sec = 0, .tm_min = 0, .tm_hour = 0, .tm_mday = 1, .tm_year = 70,
+                    .tm_wday = 4, .tm_yday = 0, .tm_isdst = 0, .tm_gmtoff = 0, .tm_zone = "UTC" };
+
+    tm *info = gmtime(&a);
+    if (info->tm_sec != expected.tm_sec || info->tm_min != expected.tm_min ||
+        info->tm_hour != expected.tm_hour || info->tm_mday != expected.tm_mday ||
+        info->tm_year != expected.tm_year || info->tm_wday != expected.tm_wday ||
+        info->tm_yday != expected.tm_yday || info->tm_isdst != expected.tm_isdst ||
+        info->tm_gmtoff != expected.tm_gmtoff || strcmp(info->tm_zone, expected.tm_zone) != 0) {
+            exit(1);
+    }
+
+    if (info->tm_sec != expected.tm_sec || info->tm_min != expected.tm_min ||
+        info->tm_hour != expected.tm_hour || info->tm_mday != expected.tm_mday ||
+        info->tm_year != expected.tm_year || info->tm_wday != expected.tm_wday ||
+        info->tm_yday != expected.tm_yday || info->tm_isdst != expected.tm_isdst ||
+        info->tm_gmtoff != expected.tm_gmtoff || strcmp(info->tm_zone, expected.tm_zone) != 0) {
+            exit(1);
+    }
+    return 0;
+}

tests/locale.c

+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
+
+int main() {
+    // TODO: Implement locale properly and test it here
+    char* val = setlocale(LC_ALL, NULL);
+    if (strcmp(val, "C") == 0) {
+        puts("success!");
+    } else {
+        printf("setlocale returned the wrong value: %s", val);
+    }
+}

tests/printf.c

@@ -2,9 +2,10 @@
 
 int main(int argc, char ** argv) {
     printf(
-        "percent: %%\nstring: %s\nchar: %c\nint: %d\nuint: %u\nhex: %x\nHEX: %X\nstring: %s\n",
+        "percent: %%\nstring: %s\nchar: %c\nchar: %c\nint: %d\nuint: %u\nhex: %x\nHEX: %X\nstring: %s\n",
         "String",
         'c',
+        254,
         -16,
         32,
         0xbeef,

tests/rename.c

@@ -3,22 +3,22 @@
 #include <string.h>
 #include <unistd.h>
 
-static char old[] = "old-name.out";
-static char new[] = "new-name.out";
+static char oldpath[] = "old-name.out";
+static char newpath[] = "new-name.out";
 static char str[] = "Hello, World!";
 int str_len = 13;
 
 int main() {
     char buf[14];
     buf[13] = 0x00;
-    int fd = creat(old, 0777);
+    int fd = creat(oldpath, 0777);
     write(fd, str, str_len);
     close(fd);
-    rename(old, new);
-    fd = open(new, O_RDONLY);
+    rename(oldpath, newpath);
+    fd = open(newpath, O_RDONLY);
     read(fd, buf, str_len);
     close(fd);
-    remove(new);
+    remove(newpath);
     if (strcmp(str, buf) == 0) {
         return 0;
     } else {

tests/scanf.c

+#include <stdio.h>
+
+int main(int argc, char ** argv) {
+    int a = 0;
+    int b = 0;
+    int val = sscanf("123 0x321", "%d %i", &a, &b);
+    if (val != 2) {
+        printf("error: %d\n", val);
+    } else {
+        if (a == 123 && b == 0x321) {
+            puts("success!");
+        } else {
+            printf("incorrect results: { a: %d, b: %x }\n", a, b);
+        }
+    }
+}

tests/setjmp.c

+#include <stdio.h>
+#include <setjmp.h>
+
+int main() {
+    jmp_buf buf;
+    if (setjmp(buf)) {
+        puts("hi from jump");
+    } else {
+        puts("jumping...");
+        longjmp(buf, 0);
+    }
+}

tests/stdlib/strtoul.c

+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+int main(int argc, char* argv[]) {
+    printf("%ld\n", strtoul("         -42", NULL, 0));
+    printf("%ld\n", strtoul(" +555", NULL, 0));
+    printf("%ld\n", strtoul("   1234567890    ", NULL, 0));
+
+    printf("%ld\n", strtoul("         -42", NULL, 10));
+    printf("%ld\n", strtoul(" +555", NULL, 10));
+    printf("%ld\n", strtoul("   1234567890    ", NULL, 10));
+
+    printf("%lx\n", strtoul("  0x38Acfg", NULL, 0));
+    printf("%lx\n", strtoul("0Xabcdef12", NULL, 16));
+
+    printf("%lo\n", strtoul("  073189", NULL, 0));
+    printf("%lo\n", strtoul("     073189", NULL, 8));
+
+    printf("%lo\n", strtoul("  0b", NULL, 8));
+    if(errno != 0) {
+        printf("errno is not 0 (%d), something went wrong\n", errno);
+    }
+    printf("%lo\n", strtoul("  0b", NULL, 0));
+    if(errno != 0) {
+        printf("errno is not 0 (%d), something went wrong\n", errno);
+    }
+
+    return 0;
+}

tests/time.c

@@ -7,5 +7,7 @@ int main(int argc, char** argv) {
     perror("clock_gettime");
     time(NULL);
     perror("time");
+    clock_t c = clock();
+    perror("clock");
     return 0;
 }

va_list @ 1e7a8b6b

-Subproject commit ba5a07a744915b501acadb17e05db0f5d6552f72
+Subproject commit 1e7a8b6b6f8171caab6c8c531ee9f1983bc2ebe0