Changeset 832

Timestamp:

Oct 12, 2003, 5:20:05 PM (22 years ago)

Author:

bird

Message:

Worked around error with DosSetFileLocksL on non JFS FSes.

File:

• trunk/src/emx/src/lib/sys/__fcntl.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/lib/sys/__fcntl.c

@@ -6 +6 @@
 #include <limits.h>
 #include <io.h>
+#define INCL_ERRORS
 #define INCL_FSMACROS
 #include <os2emx.h>
@@ -172 +173 @@
         /* Do work. */
 #if OFF_MAX > LONG_MAX
+        rc = ERROR_INVALID_PARAMETER;
         if (__pfnDosSetFileLocksL)
         {
@@ -182 +184 @@
             FS_RESTORE();
         }
-        else
+        /* There is/was a bug in the large API which make it fail on non JFS
+         * disks with ERROR_INVALID_PARAMETER. We need to work around this. */
+        if (rc == ERROR_INVALID_PARAMETER)
 #endif
         {
@@ -188 +192 @@
 #if OFF_MAX > LONG_MAX
             if (    offStart > LONG_MAX
-                ||  cbRange > LONG_MAX
-                ||  offStart + cbRange > LONG_MAX
+                ||  (   cbRange != OFF_MAX
+                     && (   cbRange > LONG_MAX
+                         || offStart + cbRange > LONG_MAX)
+                     )
                 )
               {