Changeset 96091 in vbox

Timestamp:

Aug 7, 2022 2:18:06 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152890

Message:

IPRT/nocrt: Added clearerr, ferror, fgetc, fileno, fputc, fputs, fread, fseek, fseeko, ftell, ftello, fwrite, getc, puc, puts and setvbuf. bugref:10261

Location:

trunk

Files:

• include/iprt/nocrt/stdio.h (modified) (3 diffs)
• include/iprt/nocrt/unistd.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/r3/nocrt-clearerr.cpp (added)
• src/VBox/Runtime/r3/nocrt-ferror.cpp (added)
• src/VBox/Runtime/r3/nocrt-fgetc.cpp (added)
• src/VBox/Runtime/r3/nocrt-fileno.cpp (added)
• src/VBox/Runtime/r3/nocrt-fputc.cpp (added)
• src/VBox/Runtime/r3/nocrt-fputs.cpp (added)
• src/VBox/Runtime/r3/nocrt-fread.cpp (added)
• src/VBox/Runtime/r3/nocrt-fseek.cpp (added)
• src/VBox/Runtime/r3/nocrt-fseeko.cpp (added)
• src/VBox/Runtime/r3/nocrt-ftell.cpp (added)
• src/VBox/Runtime/r3/nocrt-ftello.cpp (added)
• src/VBox/Runtime/r3/nocrt-fwrite.cpp (added)
• src/VBox/Runtime/r3/nocrt-getc.cpp (added)
• src/VBox/Runtime/r3/nocrt-putc.cpp (added)
• src/VBox/Runtime/r3/nocrt-puts.cpp (added)
• src/VBox/Runtime/r3/nocrt-setvbuf.cpp (added)

trunk/include/iprt/nocrt/stdio.h

@@ -31 +31 @@
 
 #include <iprt/stream.h>
-#include <iprt/nocrt/sys/types.h> /* errno_t, off_t */
+#include <iprt/nocrt/sys/types.h>   /* errno_t, off_t */
+#ifdef IPRT_NO_CRT_FOR_3RD_PARTY
+# include <iprt/nocrt/time.h>       /* file.h includes fs.h which includes time.h */
+# include <iprt/file.h>             /* for RTFILE_SEEK_XXX */
+# include <iprt/assertcompile.h>
+#endif
 
 typedef RTFOFF fpos_t;
@@ -41 +46 @@
  * check each printf and fprintf call as IPRT isn't 100% compatible...
  */
+
+/* These are also in unistd.h: */
+# undef  SEEK_SET
+# define SEEK_SET   RTFILE_SEEK_BEGIN
+# undef  SEEK_CUR
+# define SEEK_CUR   RTFILE_SEEK_CURRENT
+# undef  SEEK_END
+# define SEEK_END   RTFILE_SEEK_END
+AssertCompile(SEEK_SET == 0); AssertCompile(SEEK_CUR == 1); AssertCompile(SEEK_END == 2); /* Also in WDK header mmiscapi.h. */
+
+
 RT_C_DECLS_BEGIN
 
@@ -73 +89 @@
 int     RT_NOCRT(puts)(const char *psz);
 int     RT_NOCRT(fputc)(int, FILE *pFile);
+int     RT_NOCRT(putc)(int, FILE *pFile);
 size_t  RT_NOCRT(fread)(void *pvBuf, size_t cbItem, size_t cItems, FILE *pFile);
 int     RT_NOCRT(fgetc)(FILE *pFile);

trunk/include/iprt/nocrt/unistd.h

@@ -31 +31 @@
 
 #include <iprt/nocrt/sys/types.h>
+#ifdef IPRT_NO_CRT_FOR_3RD_PARTY
+# include <iprt/nocrt/time.h>       /* file.h includes fs.h which includes time.h */
+# include <iprt/file.h>             /* for RTFILE_SEEK_XXX */
+# include <iprt/assertcompile.h>
+#endif
+
 
 #ifdef IPRT_NO_CRT_FOR_3RD_PARTY
 
 /* Flags for access: */
-#define F_OK    0
-#define X_OK    1
-#define W_OK    2
-#define R_OK    4
+# define F_OK       0
+# define X_OK       1
+# define W_OK       2
+# define R_OK       4
+
+/* These are also in stdio.h: */
+# undef  SEEK_SET
+# define SEEK_SET   RTFILE_SEEK_BEGIN
+# undef  SEEK_CUR
+# define SEEK_CUR   RTFILE_SEEK_CURRENT
+# undef  SEEK_END
+# define SEEK_END   RTFILE_SEEK_END
+AssertCompile(SEEK_SET == 0); AssertCompile(SEEK_CUR == 1); AssertCompile(SEEK_END == 2); /* Also in WDK header mmiscapi.h. */
 
 RT_C_DECLS_BEGIN

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1833 +1833 @@
         r3/nocrt-tmpfile.cpp \
         r3/nocrt-tmpfile_s.cpp \
+        r3/nocrt-fileno.cpp \
         r3/nocrt-fclose.cpp \
         r3/nocrt-fflush.cpp \
+        r3/nocrt-setvbuf.cpp \
+        r3/nocrt-fseek.cpp \
+        r3/nocrt-fseeko.cpp \
+        r3/nocrt-ftell.cpp \
+        r3/nocrt-ftello.cpp \
+        r3/nocrt-fwrite.cpp \
+        r3/nocrt-fputc.cpp \
+        r3/nocrt-putc.cpp \
+        r3/nocrt-fputs.cpp \
+        r3/nocrt-puts.cpp \
+        r3/nocrt-fread.cpp \
+        r3/nocrt-fgetc.cpp \
+        r3/nocrt-getc.cpp \
+        r3/nocrt-clearerr.cpp \
+        r3/nocrt-ferror.cpp \
 
   RuntimeR3_SOURCES.x86 = $(RuntimeBaseR3_SOURCES.x86) \