Changeset 3638

Timestamp:

06/18/08 22:14:59 (4 months ago)

Author:

kris

Message:

FileConduit? now based around char[], and exposes the open() method for use.

Files:

• trunk/tango/io/FileConduit.d (modified) (16 diffs)

trunk/tango/io/FileConduit.d

@@ -23 +23 @@
-private import  tango.io.DeviceConduit;
-
+private import  stdc = tango.stdc.stringz;
+
-private import  Utf = tango.text.convert.Utf;
-
@@ -237 +239 @@
-
-        // the file we're working with 
-PathView
+char[] 
-
-        // the style we're opened with
-
+
+
+
+
+
+
+
+
+
+
+
-
-        /***********************************************************************
@@ -248 +260 @@
-        ***********************************************************************/
-
-name
-
-this (new FilePath(name)
+path
+
+open (path
-        }
-
@@ -257 +269 @@
-                Create a FileConduit with the provided path and style.
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        }    
-
@@ -272 +282 @@
-                Return the PathView used by this file.
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }               
-
@@ -298 +311 @@
-        override char[] toString ()
-        {
-.toString
+
-        }               
-
@@ -346 +359 @@
-                ***************************************************************/
-
-protected void open (Style style
+void open (char[] path, Style style = ReadExisting
-                {
-                        DWORD   attr,
@@ -386 +399 @@
-                                        FILE_FLAG_WRITE_THROUGH,
-                                        ];
+
+                        // remember our settings
+                        assert(path);
+                        path_ = path;
+                        style_ = style;
-
-                        attr   = Attr[style.cache];
@@ -399 +417 @@
-                             else
-                                {
-
-
-
+
+
+
+
+
+
+
+
+
-                                                      null, create, 
-                                                      attr | FILE_ATTRIBUTE_NORMAL,
@@ -408 +432 @@
-
-                        if (handle is INVALID_HANDLE_VALUE)
- ()
+
-
-                        // move to end of file?
@@ -445 +469 @@
-                        // must have Generic_Write access
-                        if (! SetEndOfFile (handle))
- ()
+
-                }               
-
@@ -463 +487 @@
-                        if (result is -1 && 
-                            GetLastError() != ERROR_SUCCESS)
- ()
+
-
-                        return result + (cast(long) high << 32);
@@ -491 +515 @@
-                ***************************************************************/
-
-protected void open (Style style
+void open (char[] path, Style style = ReadExisting
-                {
-                        alias int[] Flags;
@@ -519 +543 @@
-                                        ];
-                                                
+                        // remember our settings
+                        assert(path);
+                        path_ = path;
+                        style_ = style;
+
+                        // zero terminate and convert to utf16
+                        char[512] zero = void;
+                        auto name = stdc.toStringz (path, zero);
-                        auto mode = Access[style.access] | Create[style.open];
-
-                        // always open as a large file
-path.cString.ptr
+name
-                        if (handle is -1)
- ()
+
-                }
-
@@ -539 +571 @@
-                        // set filesize to be current seek-position
-                        if (ftruncate (handle, cast(int) position) is -1)
- ()
+
-                }               
-
@@ -553 +585 @@
-                        long result = posix.lseek (handle, cast(int) offset, anchor);
-                        if (result is -1)
- ()
+
-                        return result;
-                }