wwww

[16.git] / src / lib / 16_ca.c

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index e2963290a8a8f40d2e42861c58e6d252245a76a7..fe76ec2c4ad5f8ef5184824ca3b6556708715766 100644 (file)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -216,43 +216,47 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================\r
 */\r
 \r
-boolean CA_FarRead (int handle, byte huge *dest, dword length)\r
+boolean CA_FarRead(int handle, byte huge *dest, dword length)\r
 {\r
        boolean flag;\r
        dword fat=0;
        word segm=0;\r
-       while(length>0xffffl)
+       if(length>0xfffflu)
        {
-               fat=length-0xffffl;
-               segm++;\r
+               segm=(length%0xfffflu)-1;
+               fat=segm*0xfffflu;
+               length-=fat;\r
 //             printf("CA_FarRead doesn't support 64K reads yet!\n");\r
        }
-\r
-       __asm\r
+
+       if(!fat&&!segm)
        {\r
-               push    ds\r
-               mov     bx,[handle]\r
-               mov     cx,[WORD PTR length]\r
-               mov     dx,[WORD PTR dest]\r
-               mov     ds,[WORD PTR dest+2]\r
-               mov     ah,0x3f                         // READ w/handle\r
-               int     21h\r
-               pop     ds\r
-               jnc     good\r
-               mov     errno,ax\r
-               mov     flag,0\r
-               jmp End\r
+               __asm\r
+               {\r
+                       push    ds\r
+                       mov     bx,[handle]\r
+                       mov     cx,[WORD PTR length]\r
+                       mov     dx,[WORD PTR dest]\r
+                       mov     ds,[WORD PTR dest+2]\r
+                       mov     ah,0x3f                         // READ w/handle\r
+                       int     21h\r
+                       pop     ds\r
+                       jnc     good\r
+                       mov     errno,ax\r
+                       mov     flag,0\r
+                       jmp End\r
 good:\r
-               cmp     ax,[WORD PTR length]\r
-               je      done\r
-//             errno = EINVFMT;                        // user manager knows this is bad read\r
-               mov     flag,0\r
-               jmp End\r
+                       cmp     ax,[WORD PTR length]\r
+                       je      done\r
+//                     errno = EINVFMT;                        // user manager knows this is bad read\r
+                       mov     flag,0\r
+                       jmp End\r
 done:\r
-               mov     flag,1\r
+                       mov     flag,1\r
 End:\r
-       }\r
-       return flag;\r
+               }\r
+       return flag;
+       }else return 0;//todo: EXPAND!!!\r
 }\r
 \r
 \r
@@ -266,43 +270,47 @@ End:
 ==========================\r
 */\r
 \r
-boolean CA_FarWrite (int handle, byte huge *source, dword length)\r
+boolean CA_FarWrite(int handle, byte huge *source, dword length)\r
 {\r
        boolean flag;\r
        dword fat=0;
        word segm=0;\r
-       while(length>0xffffl)
+       if(length>0xfffflu)
        {
-               fat=length-0xffffl;
-               segm++;\r
+               segm=(length%0xfffflu)-1;
+               fat=segm*0xfffflu;
+               length-=fat;\r
 //             printf("CA_FarRead doesn't support 64K reads yet!\n");\r
        }\r
-\r
-       __asm\r
+
+       if(!fat&&!segm)
        {\r
-               push    ds\r
-               mov     bx,[handle]\r
-               mov     cx,[WORD PTR length]\r
-               mov     dx,[WORD PTR source]\r
-               mov     ds,[WORD PTR source+2]\r
-               mov     ah,0x40                 // WRITE w/handle\r
-               int     21h\r
-               pop     ds\r
-               jnc     good\r
-               mov     errno,ax\r
-               mov flag,0\r
-               jmp End\r
+               __asm\r
+               {\r
+                       push    ds\r
+                       mov     bx,[handle]\r
+                       mov     cx,[WORD PTR length]\r
+                       mov     dx,[WORD PTR source]\r
+                       mov     ds,[WORD PTR source+2]\r
+                       mov     ah,0x40                 // WRITE w/handle\r
+                       int     21h\r
+                       pop     ds\r
+                       jnc     good\r
+                       mov     errno,ax\r
+                       mov flag,0\r
+                       jmp End\r
 good:\r
-               cmp     ax,[WORD PTR length]\r
-               je      done\r
-       //errno = ENOMEM;                               // user manager knows this is bad write\r
-               mov     flag,0\r
-               jmp End\r
+                       cmp     ax,[WORD PTR length]\r
+                       je      done\r
+                       //errno = ENOMEM;                               // user manager knows this is bad write\r
+                       mov     flag,0\r
+                       jmp End\r
 done:\r
-               mov     flag,1\r
+                       mov     flag,1\r
 End:\r
-       }\r
-       return flag;\r
+               }\r
+       return flag;
+       }else return 0;\r
 }\r
 \r
 \r