Changeset 2 for trunk/orca/files.c

Timestamp:

01/25/06 14:55:17 (3 years ago)

Author:

krobillard

Message:

orca - Fixed read on Windows.
qt - Added append-text native.

Files:

• trunk/orca/files.c (modified) (4 diffs)

trunk/orca/files.c

@@ -248 +248 @@
     if( a1->type == OT_FILE )
     {
+        int n;
         const char* fn;
         OString* str = orSTRING(a1);
@@ -254 +255 @@
 
         fn = str->charArray + a1->series.index;
-        if( orIsDir( fn ) )
+        n = orIsDir( fn );
+        if( n < 0 )
+        {
+            goto read_error;
+        }
+        else if( n == 1 )
         {
             orReadDir( fn );
@@ -280 +286 @@
                 FileHandle fp;
                 OString* buf;
-                int n;
+                int err;
                 int size;
                 int skip = 0;
@@ -323 +329 @@
 
                     n = fileRead( fp, buf->buf, size );
+                    err = fileError( fp );
                     fileClose( fp );
 
-                    if( n != size )
+                    if( err )
                     {
+read_error:
                         orErrorT( OR_ERROR_ACCESS, "read failed on %s", fn );
                         return;
                     }
 
-                    buf->used = size;
+                    buf->used = n;
                     orResultSeries( orRefineSet(REF_READ_BINARY) ?
                                     OT_BINARY : OT_STRING,