Changeset 1565

Timestamp:

05/29/10 06:00:53 (15 years ago)

Author:

rsinfu

Message:

Made rawRead/rawWrite always operate in binary mode on Windows.

Files:

• trunk/phobos/std/stdio.d (modified) (3 diffs)

trunk/phobos/std/stdio.d

@@ -24 +24 @@
-private import core.memory, core.stdc.errno, core.stdc.stddef,
-    core.stdc.stdlib, core.stdc.string, core.stdc.wchar_;
-private import std.algorithm, std.array, std.contracts, std.conv, std.file, std.format,
-    /*std.metastrings,*/ std.range, std.string, std.traits, std.typecons,
-    std.typetuple, std.utf;
-
-version (DigitalMars) version (Windows)
-{
-    // Specific to the way Digital Mars C does stdio
-    version = DIGITAL_MARS_STDIO;
-
+, FHND_TEXT
-}
-
-version (linux)
-{
-    // Specific to the way Gnu C does stdio
-    version = GCC_IO;
-    extern(C) FILE* fopen64(const char*, const char*);
-}
-
-version (OSX)
@@ -66 +66 @@
-         * Digital Mars under-the-hood C I/O functions.
-     * Use _iobuf* for the unshared version of FILE*,
-     * usable when the FILE is locked.
-         */
-        int _fputc_nlock(int, _iobuf*);
-        int _fputwc_nlock(int, _iobuf*);
-        int _fgetc_nlock(_iobuf*);
-        int _fgetwc_nlock(_iobuf*);
-        int __fp_lock(FILE*);
-        void __fp_unlock(FILE*);
+
+        int setmode(int, int);
-    }
-    alias _fputc_nlock FPUTC;
-    alias _fputwc_nlock FPUTWC;
-    alias _fgetc_nlock FGETC;
-    alias _fgetwc_nlock FGETWC;
-
-    alias __fp_lock FLOCK;
-    alias __fp_unlock FUNLOCK;
+
+    alias setmode _setmode;
+    enum _O_BINARY = 0x8000;
+    int _fileno(FILE* f) { return f._file; }
-}
-else version (GCC_IO)
-{
-    /* **
-     * Gnu under-the-hood C I/O functions; see
-     * http://www.gnu.org/software/libc/manual/html_node/I_002fO-on-Streams.html#I_002fO-on-Streams
-     */
-    //private import std.c.linux.linux;
-    private import core.sys.posix.stdio;
-    extern (C)
@@ -429 +435 @@
-    {
-        errnoEnforce
-        (.fflush(enforce(p.handle, "Calling fflush() on an unopened file"))
-                == 0);
-    }
-
-/**
-If the file is not opened, throws an exception. Otherwise, calls $(WEB
-cplusplus.com/reference/clibrary/cstdio/fread.html, fread) for the
-file handle and throws on error.
+
+$(D rawRead) always read in binary mode on Windows.
- */
-    T[] rawRead(T)(T[] buffer)
-    {
-        enforce(buffer.length);
+        version(Windows)
+        {
+            immutable fd = ._fileno(p.handle);
+            immutable mode = ._setmode(fd, _O_BINARY);
+            scope(exit) ._setmode(fd, mode);
+            version(DIGITAL_MARS_STDIO)
+            {
+                // @@@BUG@@@ 4243
+                immutable info = __fhnd_info[fd];
+                __fhnd_info[fd] &= ~FHND_TEXT;
+                scope(exit) __fhnd_info[fd] = info;
+            }
+        }
-        immutable result =
-            .fread(buffer.ptr, T.sizeof, buffer.length, p.handle);
-        errnoEnforce(!error);
-        return result ? buffer[0 .. result] : null;
-    }
-
+    unittest
+    {
+        std.file.write("deleteme", "\r\n\n\r\n");
+        scope(exit) std.file.remove("deleteme");
+        auto f = File("deleteme", "r");
+        auto buf = f.rawRead(new char[5]);
+        f.close();
+        assert(buf == "\r\n\n\r\n");
+        /+
+        buf = stdin.rawRead(new char[5]);
+        assert(buf == "\r\n\n\r\n");
+        +/
+    }
+
-/**
-If the file is not opened, throws an exception. Otherwise, calls $(WEB
-cplusplus.com/reference/clibrary/cstdio/fwrite.html, fwrite) for the
-file handle and throws on error.
+
+$(D rawWrite) always write in binary mode on Windows.
- */
-    void rawWrite(T)(in T[] buffer)
-    {
+        version(Windows)
+        {
+            flush(); // before changing translation mode
+            immutable fd = ._fileno(p.handle);
+            immutable mode = ._setmode(fd, _O_BINARY);
+            scope(exit) ._setmode(fd, mode);
+            version(DIGITAL_MARS_STDIO)
+            {
+                // @@@BUG@@@ 4243
+                immutable info = __fhnd_info[fd];
+                __fhnd_info[fd] &= ~FHND_TEXT;
+                scope(exit) __fhnd_info[fd] = info;
+            }
+            scope(exit) flush(); // before restoring translation mode
+        }
-        auto result =
-            .fwrite(buffer.ptr, T.sizeof, buffer.length, p.handle);
-        if (result == result.max) result = 0;
-        errnoEnforce(result == buffer.length,
-                text("Wrote ", result, " instead of ", buffer.length,
-                        " objects of type ", T.stringof, " to file `",
-                        p.name, "'"));
+    }
+
+    unittest
+    {
+        auto f = File("deleteme", "w");
+        scope(exit) std.file.remove("deleteme");
+        f.rawWrite("\r\n\n\r\n");
+        f.close();
+        assert(std.file.read("deleteme") == "\r\n\n\r\n");
+        /+
+        stdout.rawWrite("\r\n\n\r\n");
+        +/
-    }
-
-/**
-If the file is not opened, throws an exception. Otherwise, calls $(WEB
-cplusplus.com/reference/clibrary/cstdio/fseek.html, fseek) for the
-file handle. Throws on error.
- */
-    void seek(long offset, int origin = SEEK_SET)
-    {
-        enforce(p && p.handle,