r16128@catbus: nickm | 2007-10-24 22:52:16 -0400

 Fix windows mmap changes.

svn:r12171

diff --git a/doc/TODO b/doc/TODO
index 922bef35011d9d1620d232938bf709a3af5012a5..5e5bbdaeec22d47c2ca24ffc4d1d145cefe90aab 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -84,10 +84,10 @@ Things we'd like to do in 0.2.0.x:
       o Implement voting side
         o Set Named and Unnamed sensibly
         o Don't reject Unnamed routers.
-      . Implement consensus side
+      o Implement consensus side
         o Generic "pick which voting method to use" code.
         o When version 2 is set, set the Unnamed flag right.
-        - Mention (and admit to ourself) that we support method 2.
+        o Mention (and admit to ourself) that we support method 2.
       o Implement client side
 
   - Refactoring:

diff --git a/src/common/compat.c b/src/common/compat.c
index cc8ef3aecd47a870b9242d883cdd708cd048e665..1bc653f25ad15d783bc0425599fc441b40299de3 100644 (file)
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -250,11 +250,11 @@ tor_mmap_file(const char *filename)
     char *msg = format_win32_error(e);
     log_fn(severity, LD_FS, "Couldn't mmap file \"%s\": %s", filename, msg);
     tor_free(msg);
+    if (e == ERROR_FILE_NOT_FOUND || e == ERROR_PATH_NOT_FOUND)
+      errno = ENOENT;
+    else
+      errno = EINVAL;
   }
-  if (e == ERROR_FILE_NOT_FOUND || e == ERROR_PATH_NOT_FOUND)
-    e = ENOENT;
-  else
-    e = EINVAL;
  err:
   if (empty)
     errno = ERANGE;