Merge pull request managarm#1803 from zinnia-os/zinnia-xfce

options/{ansi,posix}: Assortment of fixes for XFCE

Author: no92

options/ansi/generic/file-io.cpp

@@ -327,6 +327,9 @@ int abstract_file::seek(off_t offset, int whence) {
 	// TODO: If the seek is "small", we can just modify our internal offset.
 	purge();
 
+	// A successful seek clears the end-of-file indicator.
+	__status_bits &= ~__MLIBC_EOF_BIT;
+
 	return 0;
 }
 

options/ansi/generic/stdio.cpp

@@ -1209,27 +1209,33 @@ int do_scanf(H &handler, const Char *fmt, __builtin_va_list args) {
 				unsigned long long res = 0;
 				char c = handler.look_ahead();
 				int digit_count = 0;
+				int consumed = 0;
 				EOF_CHECK(c == '\0');
 
 				if(c == '-') {
 					handler.consume();
+					consumed++;
 					is_negative = true;
-				} else if(c == '+')
+				} else if(c == '+') {
 					handler.consume();
+					consumed++;
+				}
 
 				c = handler.look_ahead();
-				if (c == '0') {
+				if (c == '0' && (!width || consumed < width)) {
 					handler.consume();
+					consumed++;
 					c = handler.look_ahead();
-					if (tolower(c) == 'x') {
+					if (tolower(c) == 'x' && (!width || consumed < width)) {
 						handler.consume();
+						consumed++;
 						c = handler.look_ahead();
 					} else {
 						digit_count++;
 					}
 				}
 
-				while (true) {
+				while (!width || consumed < width) {
 					if (c >= '0' && c <= '9') {
 						handler.consume();
 						res = res * 16 + (c - '0');
@@ -1243,6 +1249,7 @@ int do_scanf(H &handler, const Char *fmt, __builtin_va_list args) {
 						break;
 					}
 					digit_count++;
+					consumed++;
 					c = handler.look_ahead();
 				}
 				NOMATCH_CHECK(digit_count == 0);

options/posix/include/dirent.h

@@ -46,6 +46,7 @@ struct posix_dent {
 
 #if defined(_DEFAULT_SOURCE)
 #define IFTODT(mode) (((mode) & 0170000) >> 12)
+#define DTTOIF(dirtype) ((dirtype) << 12)
 #endif
 
 struct __mlibc_dir_struct {

options/posix/include/sys/param.h

@@ -2,12 +2,17 @@
 #ifndef _SYS_PARAM_H
 #define _SYS_PARAM_H
 
+#include <abi-bits/dev_t.h>
 #include <endian.h>
 #include <limits.h>
 
 #define NBBY CHAR_BIT
 #define NGROUPS NGROUPS_MAX
 
+#ifndef NODEV
+#define NODEV ((dev_t)(-1))
+#endif
+
 /* Report the same value as Linux here. */
 #define MAXNAMLEN 255
 #define MAXPATHLEN 4096

scripts/rust-libc-config.yml

@@ -212,6 +212,7 @@ ignored_macros:
   - "CPU_ZERO"
   - "CPU_ZERO_S"
   - "DOUBLEBITS"
+  - "DTTOIF"
   - "FE_ALL_EXCEPT"
   - "FE_DFL_ENV"
   - "FLOATBITS"

tests/ansi/fseek-eof.c

@@ -0,0 +1,44 @@
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#if defined(USE_HOST_LIBC)
+#define TEST_FILE "fseek-eof-host-libc.tmp"
+#elif defined(USE_CROSS_LIBC)
+#define TEST_FILE "fseek-eof-cross-libc.tmp"
+#else
+#define TEST_FILE "fseek-eof.tmp"
+#endif
+
+int main() {
+	char str[] = "mlibc fseek eof test";
+	size_t str_size = sizeof(str) - 1;
+	char buffer[64];
+
+	FILE *file = fopen(TEST_FILE, "wb");
+	assert(file);
+	assert(fwrite(str, 1, str_size, file) == str_size);
+	fflush(file);
+	fclose(file);
+
+	file = fopen(TEST_FILE, "rb");
+	assert(file);
+
+	assert(fread(buffer, 1, sizeof(buffer), file) == str_size);
+	assert(feof(file));
+
+	assert(fseek(file, 0, SEEK_SET) == 0);
+	assert(!feof(file));
+
+	assert(fread(buffer, 1, 5, file) == 5);
+	assert(!memcmp(buffer, "mlibc", 5));
+	assert(!feof(file));
+
+	assert(fread(buffer, 1, sizeof(buffer), file) == str_size - 5);
+	assert(feof(file));
+	rewind(file);
+	assert(!feof(file));
+
+	fclose(file);
+	return 0;
+}

tests/ansi/sscanf.c

@@ -401,8 +401,23 @@ int main() {
 	assert(sscanf("00xc0ffee", "%x", &int_value) == 1);
 	assert(int_value == 0);
 
+	assert(sscanf("1234ab", "%2x", &int_value) == 1);
+	assert(int_value == 0x12);
+	assert(sscanf("-1234ab", "%3x", &int_value) == 1);
+	assert(int_value == -0x12);
+	assert(sscanf("+1234ab", "%3x", &int_value) == 1);
+	assert(int_value == 0x12);
+	assert(sscanf("0x1234", "%4x", &int_value) == 1);
+	assert(int_value == 0x12);
+	assert(sscanf("0x1234", "%3x", &int_value) == 1);
+	assert(int_value == 0x1);
+	assert(sscanf("-0x1234", "%4x", &int_value) == 1);
+	assert(int_value == -0x1);
+
 #if (!defined(USE_HOST_LIBC) && !defined(USE_CROSS_LIBC)) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 43)
 	// glibc before 2.42 or 2.43 did not handle prefixes with no following digits correctly
+	assert(sscanf("0x12", "%2x", &int_value) == 0);
+	assert(sscanf("-0x1234", "%3x", &int_value) == 0);
 	assert(sscanf("0xg", "%x%c", &uint_value, char_value) == 0);
 #endif
 

tests/meson.build

@@ -34,6 +34,7 @@ all_test_cases = [
 	'ansi/fgetpos',
 	'ansi/fputs',
 	'ansi/ftell',
+	'ansi/fseek-eof',
 	'ansi/tmpfile',
 	'ansi/mbstowcs',
 	'ansi/locale',