Refactored malloc.h and unistd.h compatibility.

- Added nvme/unistd.h and nvme/malloc.h
- Updated code to use new headers instead of platform/includes.h
- Removed malloc.h and unistd.h compatibility from windows.h

Author: bgoing-micron-oss

libnvme/src/meson.build

@@ -37,11 +37,13 @@ headers = [
     'nvme/lib-types.h',
     'nvme/lib.h',
     'nvme/linux.h',
+    'nvme/malloc.h',
     'nvme/nvme-cmds.h',
     'nvme/nvme-types.h',
     'nvme/stdlib.h',
     'nvme/tree.h',
     'nvme/types.h',
+    'nvme/unistd.h',
     'nvme/util.h',
 ]
 

libnvme/src/nvme/lib.h

@@ -13,6 +13,7 @@
 
 #include <nvme/lib-types.h>
 #include <nvme/stdlib.h>
+#include <nvme/unistd.h>
 
 #include <platform/includes.h> /* for libnvme_fd_t */
 

libnvme/src/nvme/malloc.h

@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * This file is part of libnvme.
+ * Copyright (c) 2026 Micron Technology, Inc.
+ *
+ * Cross-platform compatibility for malloc.h.
+ * Provides functionality that may be missing on some platforms.
+ * Compatibility is not comprehensive. Only functionality required by
+ * nvme-cli and libnvme is included.
+ * 
+ * Authors: Broc Going <[email protected]>
+ *          Brandon Capener <[email protected]>
+ */
+#pragma once
+
+#include <malloc.h>
+
+#ifdef _WIN32
+
+/* malloc_usable_size implementation for Windows */
+static inline size_t malloc_usable_size(void *ptr)
+{
+	return _msize(ptr);
+}
+
+#endif /* _WIN32 */

libnvme/src/nvme/stdlib.h

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
+ * This file is part of libnvme.
  * Copyright (c) 2026 Micron Technology, Inc.
  *
  * Cross-platform compatibility for stdlib.h.

libnvme/src/nvme/unistd.h

@@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * This file is part of libnvme.
+ * Copyright (c) 2026 Micron Technology, Inc.
+ *
+ * Cross-platform compatibility for unistd.h.
+ * Provides functionality that may be missing on some platforms.
+ * Compatibility is not comprehensive. Only functionality required by
+ * nvme-cli and libnvme is included.
+ * 
+ * Authors: Broc Going <[email protected]>
+ *          Brandon Capener <[email protected]>
+ */
+#pragma once
+
+#include <unistd.h>
+
+#if defined(_WIN32) || defined(_WIN64)
+
+#include <io.h>
+#include <sysinfoapi.h>
+
+/* unistd.h POSIX compatibility */
+
+#define STDERR_FILENO 2
+#define STDOUT_FILENO 1
+#define STDIN_FILENO  0
+
+/* getpagesize implementation for Windows */
+static inline int getpagesize(void)
+{
+	SYSTEM_INFO si;
+
+	GetSystemInfo(&si);
+	return si.dwPageSize;
+}
+
+/*
+ * readlink stub - Windows doesn't have symbolic links in the same way
+ * NOTE: This is only used by micron-nvme.c, and can be removed once that
+ * has been refactored to not rely on Linux-specific sysfs paths.
+ */
+static inline ssize_t readlink(const char *path, char *buf, size_t bufsiz)
+{
+	errno = ENOTSUP;
+	return -1;
+}
+
+/* fsync implementation for Windows */
+static inline int fsync(int fd)
+{
+	return _commit(fd);
+}
+
+#endif

libnvme/src/nvme/util.c

@@ -9,7 +9,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <malloc.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -26,6 +25,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <nvme/malloc.h>
 #include <nvme/stdlib.h>
 
 #include <ccan/endian/endian.h>

libnvme/src/platform/windows.h

@@ -167,50 +167,6 @@ static inline FILE *open_memstream(char **ptr, size_t *sizeloc)
 }
 
 
-/* malloc.h compatibility*/
-
-static inline size_t malloc_usable_size(void *ptr)
-{
-	return _msize(ptr);
-}
-
-
-/* unistd.h POSIX compatibility */
-
-#define STDERR_FILENO 2
-#define STDOUT_FILENO 1
-#define STDIN_FILENO  0
-
-/* getpagesize implementation for Windows */
-static inline DWORD getpagesize(void)
-{
-	SYSTEM_INFO si;
-
-	GetSystemInfo(&si);
-	return si.dwPageSize;
-}
-
-/*
- * readlink stub - Windows doesn't have symbolic links in the same way
- * NOTE: This is only used by micron-nvme.c, and can be removed once that
- * has been refactored to not rely on Linux-specific sysfs paths.
- */
-static inline int readlink(const char *path, char *buf, size_t bufsiz)
-{
-	(void)path;
-	(void)buf;
-	(void)bufsiz;
-	errno = EINVAL;
-	return -1;
-}
-
-/* fsync implementation for Windows */
-static inline int fsync(int fd)
-{
-	return _commit(fd);
-}
-
-
 /* time.h POSIX compatibility */
 
 static inline struct tm *gmtime_r(const time_t *timep, struct tm *result)

util/mem-windows.c

@@ -9,8 +9,10 @@
 #include <malloc.h>
 #include <string.h>
 
+#include <memoryapi.h>
+
 #include <nvme/stdlib.h>
-#include "platform/includes.h" /* unistd.h + compatibility */
+#include <nvme/unistd.h>
 
 #include "mem.h"
 #include "common.h"

util/mem.c

@@ -2,8 +2,9 @@
 #include <malloc.h>
 #include <string.h>
 
+#include <nvme/malloc.h>
 #include <nvme/stdlib.h>
-#include <platform/includes.h>	/* getpagesize, malloc_usable_size */
+#include <nvme/unistd.h>
 
 #include "mem.h"