Changeset 2703 in kBuild

Timestamp:

Nov 21, 2013 12:26:35 AM (11 years ago)

Author:

bird

Message:

NDEBUG and other adjustments.

Location:

trunk/src/lib/nt

Files:

trunk/src/lib/nt/nthlpcore.c

-              r2702
+              r2703
 #include <errno.h>
 #include "nthlp.h"
 #if 1
+#ifndef NDEBUG
 # include <stdio.h>
 #endif
 …
             return EEXIST;
         /* EXDEV            = 18 */
+        case STATUS_NOT_SAME_DEVICE:
+            return EXDEV;
         /* ENODEV           = 19 */
         /* ENOTDIR          = 20 */
 …
+    }
 #if 1
+#ifndef NDEBUG
     __debugbreak();
     fprintf(stderr, "rcNt=%#x (%d)\n", rcNt, rcNt);
 …
         case ERROR_TOO_MANY_LINKS:          errno = EMLINK; break;
 #endif
+        case ERROR_SHARING_VIOLATION:
+            errno = ETXTBSY;
+            break;
+    }

-              r2702
+              r2703
         case FILE_OVERWRITE_IF:     fW32Disp = CREATE_ALWAYS; break;
         default:
+# ifndef NDEBUG
             __debugbreak();
+# endif
             return INVALID_HANDLE_VALUE;
+    }
 …
     birdSetErrnoFromWin32(dwErr);
+#else
+#else  /* !BIRD_USE_WIN32 */
     /*
      * Call the NT API directly.
 …
+    }
 #endif
+#endif /* !BIRD_USE_WIN32 */
     return INVALID_HANDLE_VALUE;
+}

-              r2702
+              r2703
         /* On things like pagefile.sys we may get sharing violation. */
         if (GetLastError() == ERROR_SHARING_VIOLATION)
+        if (errno == ETXTBSY)
+        {
             /** @todo Fall back on the parent directory enum if we run into a sharing
 …
         rc = -1;
+    }
-#if 1
-    if (strchr(pszPath, ';'))
-        __debugbreak();
-#endif
     return rc;

Note: See TracChangeset for help on using the changeset viewer.