Changeset 225 in xtideuniversalbios

Timestamp:

Jan 27, 2012, 6:19:21 PM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial Server, minor improvements to file handling.

Location:

trunk/Serial_Server

Files:

• library/File.h (modified) (2 diffs)
• library/FlatImage.h (modified) (1 diff)
• win32/Win32.cpp (modified) (2 diffs)
• win32/Win32File.h (modified) (4 diffs)
• win32/Win32Serial.h (modified) (2 diffs)

trunk/Serial_Server/library/File.h

@@ -18 +18 @@
 {
 public:
-    void Create( char *p_name )
+    int Create( char *p_name )
     {
         fp = fopen( p_name, "r" );
 
         if( fp )
-            log( -1, "Create Failure: '%s' already exists", p_name );
+        {
+            log( 0, "'%s' file already exists", p_name );
+            fclose( fp );
+            return( 0 );
+        }
         
         if( !(fp = fopen( p_name, "w" )) )
@@ -29 +33 @@
 
         name = p_name;
+        
+        return( 1 );
     }
 

trunk/Serial_Server/library/FlatImage.h

@@ -30 +30 @@
             sizef = size / 2048.0;   // 512 byte sectors -> MB
 
-            cf.Create( name );
-
-            memset( &buff[0], 0, 512 );
-            while( size-- )
-                cf.Write( &buff[0], 512 );
-        
-            if( p_cyl > 1024 )
-                log( 0, "Created file '%s', size %.1lf MB", name, sizef );
-            else
-                log( 0, "Created file '%s', geometry %u:%u:%u, size %.1lf MB", name, p_cyl, p_sect, p_head, sizef );
-
-            cf.Close();
+            if( cf.Create( name ) )
+            {
+                memset( &buff[0], 0, 512 );
+                while( size-- )
+                    cf.Write( &buff[0], 512 );
+                
+                if( p_cyl > 1024 )
+                    log( 0, "Created file '%s', size %.1lf MB", name, sizef );
+                else
+                    log( 0, "Created file '%s', geometry %u:%u:%u, size %.1lf MB", name, p_cyl, p_sect, p_head, sizef );
+                cf.Close();
+            }
         }
 

trunk/Serial_Server/win32/Win32.cpp

@@ -26 +26 @@
         "",
         "  -g [cyl:head:sect]  Geometry in cylinders, sectors per cylinder, and heads",
-        "                      -g without parameters uses CHS mode (default is LBA28)",
+        "                      -g also implies CHS addressing mode (default is LBA28)",
         "",
         "  -n [megabytes]      Create new disk with given size or use -g geometry",
@@ -161 +161 @@
         else if( imagecount < 2 )
         {
+            if( createFile && cyl == 0 )
+            {
+                cyl = 65;
+                sect = 63;
+                head = 16;
+            }
             images[imagecount] = new FlatImage( argv[t], readOnly, imagecount, createFile, cyl, head, sect, useCHS );
             imagecount++;

trunk/Serial_Server/win32/Win32File.h

@@ -18 +18 @@
 {
 public:
-    void Create( char *p_name )
+    int Create( char *p_name )
     {
         fp = CreateFileA( p_name, GENERIC_WRITE, 0, 0, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 );
-        if( !fp )
-            log( -1, "'%s', could not create file", p_name );
+
+        if( fp == INVALID_HANDLE_VALUE )
+        {
+            if( GetLastError() == ERROR_FILE_EXISTS )
+            {
+                log( 0, "'%s', file already exists", p_name );
+                return( 0 );
+            }
+            else
+                log( -1, "'%s', could not create file", p_name );
+        }
+
         name = p_name;
+
+        return( 1 );
     }
 
@@ -29 +41 @@
     {
         fp = CreateFileA( p_name, GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
-        if( !fp )
+
+        if( fp == INVALID_HANDLE_VALUE )
             log( -1, "'%s', could not open file", p_name );
+
         name = p_name;
     }
@@ -78 +92 @@
 
         if( !ReadFile( fp, buff, len, &out_len, NULL ) || len != out_len )
-            log( -1, "'%s', ReadFile failed" );
+            log( -1, "'%s', ReadFile failed", name );
     }
 
@@ -86 +100 @@
 
         if( !WriteFile( fp, buff, len, &out_len, NULL ) || len != out_len )
-            log( -1, "'%s', WriteFile failed" );
+            log( -1, "'%s', WriteFile failed", name );
     }
 

trunk/Serial_Server/win32/Win32Serial.h

@@ -40 +40 @@
         
             pipe = CreateNamedPipeA( PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_REJECT_REMOTE_CLIENTS, 2, 1024, 1024, 0, NULL );
-            if( !pipe )
+            if( pipe == INVALID_HANDLE_VALUE )
                 log( -1, "Could not CreateNamedPipe " PIPENAME );
         
@@ -62 +62 @@
             
                 pipe = CreateFileA( name, GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
-                if( !pipe )
+                if( pipe == INVALID_HANDLE_VALUE )
                     log( -1, "Could not Open \"%s\"", name );