Added NETBSD getvfsstat function amd missing blkcnt_t in sys/types.h

libc.gmk

@@ -148,6 +148,7 @@ C_NL_TYPES := \
 C_POSIX := \
 	posix/fnmatch.o \
 	posix/fstatvfs.o \
+	posix/getvfsstat.o \
 	posix/glob.o \
 	posix/globfree.o \
 	posix/basename.o \

library/include/sys/statvfs.h

@@ -8,6 +8,9 @@
 #define ST_NOSUID         0x0002 /* Does not support the semantics of the ST_ISUID and ST_ISGID file mode bits. */
 #define ST_CASE_SENSITIVE 0x0004 /* The file system is case sensitive. */
 
+#define ST_WAIT           1
+#define ST_NOWAIT         2
+
 __BEGIN_DECLS
 
 struct statvfs {
@@ -24,10 +27,14 @@ struct statvfs {
     unsigned long f_fsid;
     unsigned long f_flag;
     unsigned long f_namemax;
+
+    char f_mntonname[256];  // Mount point
+    char f_fstypename[32];  // File system type
 };
 
 extern int statvfs(const char *, struct statvfs *);
 extern int fstatvfs(int, struct statvfs *);
+extern int getvfsstat(struct statvfs *buf, size_t bufsize, int flags);
 
 __END_DECLS
 

library/include/sys/types.h

@@ -59,6 +59,11 @@ typedef unsigned long useconds_t;
 typedef long suseconds_t;
 
 typedef int32_t blksize_t;
+#ifndef __USE_FILE_OFFSET64
+typedef int32_t blkcnt_t;
+#else
+typedef int64_t blkcnt_t;
+#endif
 
 typedef	unsigned long long u_quad_t;	/* quads */
 typedef	long long	quad_t;

library/posix/getvfsstat.c

@@ -0,0 +1,101 @@
+/*
+ * $Id: posix_getvfsstat.c,v 1.0 2025-02-03 16:35:27 clib4devs Exp $
+*/
+
+#ifndef _STDIO_HEADERS_H
+#include "stdio_headers.h"
+#endif /* _STDIO_HEADERS_H */
+
+#ifndef _POSIX_HEADERS_H
+#include "posix_headers.h"
+#endif /* _POSIX_HEADERS_H */
+
+int
+getvfsstat(struct statvfs *buf, size_t bufsize, int flags) {
+    struct _clib4 *__clib4 = __CLIB4;
+    int count = 0;
+    uint32_t lFlags = LDF_DEVICES | LDF_READ;
+
+    /* On OS4 we don't have any difference between ST_WAIT and ST_NOWAIT */
+    if (flags != ST_WAIT && flags != ST_NOWAIT) {
+        __set_errno_r(__clib4, EINVAL);
+        return -1;
+    }
+
+    struct DosList *dosList = LockDosList(lFlags);
+    if (dosList == NULL) {
+        __set_errno_r(__clib4, ENOMEM);
+        return -1;
+    }
+
+    struct InfoData *info = AllocDosObject(DOS_INFODATA, 0);
+    if (info == NULL) {
+        __set_errno_r(__clib4, ENOMEM);
+        UnLockDosList(LDF_DEVICES | LDF_READ);
+        return -1;
+    }
+
+    // Traverse the DOS list
+    while ((dosList = NextDosEntry(dosList, lFlags))) {
+        if (dosList->dol_Port != NULL) {
+            /* If buf is NOT NULL just get all information from DosList entry and increase the count */
+            if (buf != NULL) {
+                // Check if the buffer has space
+                if (count >= bufsize / sizeof(struct statvfs)) {
+                    break;
+                }
+
+                if (GetDiskInfoTags(
+                        GDI_MsgPortInput, dosList->dol_Port,
+                        GDI_InfoData, info,
+                        TAG_END) != 0) {
+
+                    uint32 DosType = info->id_DiskType;
+
+                    /* Convert the InfoData to statvfs structure */
+                    __convert_info_to_statvfs(info, &buf[count]);
+                    /* Populate the missing statvfs structure */
+                    CopyStringBSTRToC(dosList->dol_Name, buf[count].f_mntonname, sizeof(buf[count].f_mntonname));
+
+                    /* Skip DOSType checking if Disk is not present (for example on ICD0, IDF0 and so on..) */
+                    if (info->id_DiskType != ID_NO_DISK_PRESENT) {
+                        const char *dosFormat = "%c%c%c\\%02lx";
+                        if ((DosType & 0xFF) > 0x20) {
+                            dosFormat = "%c%c%c%c";
+                        }
+                        if (!(DosType & 0xFF000000))
+                            DosType |= 0x20000000;
+                        else if (!(DosType & 0x00FF0000))
+                            DosType |= 0x00200000;
+                        else if (!(DosType & 0x0000FF00))
+                            DosType |= 0x00002000;
+
+                        sprintf(buf[count].f_fstypename, dosFormat, (DosType >> 24) & 0xFF, (DosType >> 16) & 0xFF,
+                                (DosType >> 8) & 0xFF, DosType & 0xFF);
+                    }
+                    else {
+                        /* If disk is not present set file system type to UNKNOWN */
+                        strcpy(buf[count].f_fstypename, "UNKNOWN");
+                    }
+
+                    count++;
+                }
+            }
+            else {
+                /* If buf is NULL just try to get Disk Info from DosList entry and increase the count */
+                if (GetDiskInfoTags(
+                        GDI_MsgPortInput, dosList->dol_Port,
+                        GDI_InfoData, info,
+                        TAG_END) != 0) {
+                    count++;
+                }
+            }
+        }
+    }
+    FreeDosObject(DOS_INFODATA, info);
+
+    // Unlock the DOS list
+    UnLockDosList(lFlags);
+
+    return count;
+}

library/shared_library/clib4_vectors.h

@@ -1172,14 +1172,16 @@ static void *clib4Vectors[] = {
         (void *) (__get_tc_up),                           /* 4384 */
         (void *) (__get_tc_bc),                           /* 4388 */
 
-        (void *) (0),                     /* 4392 */
+        (void *) (0),                                     /* 4392 - unused */
 
         (void *) (sigsuspend),		                      /* 4396 */
         (void *) (spawnve),                               /* 4400 */
         (void *) (sigpause),		                      /* 4404 */
         (void *) (sigwait),		                          /* 4408 */
         (void *) (sigwaitinfo),		                      /* 4412 */
         (void *) (sigtimedwait),	                      /* 4416 */
-
+
+        (void *) (getvfsstat),                            /* 4420 */
+
         (void *)-1
 };

library/shared_library/interface.h

@@ -1351,6 +1351,8 @@ struct Clib4IFace {
     int (* sigwait) (const sigset_t *set, int *sig);                                                                                                 /* 4408 */
 	int (* sigwaitinfo) (const sigset_t *set, siginfo_t *info);																						 /* 4412 */
 	int (* sigtimedwait) (const sigset_t *set, siginfo_t *info, const struct timespec *timeout);													 /* 4416 */
+
+    int (* getvfsstat) (struct statvfs *buf, size_t bufsize, int flags);                                                                             /* 4420 */
 };
 
 #ifdef __PIC__

library/shared_library/stubs_getvfsstat.c

@@ -0,0 +1,2 @@
+#include "stubs_common.h"
+Clib4Call(getvfsstat, 4420);