[tor-commits] [tor/master] Actually enable the windows absolute-path code

nickm at torproject.org nickm at torproject.org
Tue Jan 31 15:44:39 UTC 2012


commit 48424772aa9a7b3ed4710471a205a841d69337bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 31 10:42:41 2012 -0500

    Actually enable the windows absolute-path code
    
    Checking for "WINDOWS" is wrong; our magic macro is MS_WINDOWS
    
    Fixes bug 4973; bugfix on 0.2.3.11-alpha.
---
 changes/bug4973     |    3 +++
 src/common/compat.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/changes/bug4973 b/changes/bug4973
new file mode 100644
index 0000000..dd3ad69
--- /dev/null
+++ b/changes/bug4973
@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Calculate absolute paths correctly on Windows. Fixes bug 4973;
+      bugfix on 0.2.3.11-alpha.
diff --git a/src/common/compat.c b/src/common/compat.c
index 4af670a..cd11203 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1628,7 +1628,7 @@ get_parent_directory(char *fname)
 char *
 make_path_absolute(char *fname)
 {
-#ifdef WINDOWS
+#ifdef MS_WINDOWS
   char *absfname_malloced = _fullpath(NULL, fname, 1);
 
   /* We don't want to assume that tor_free can free a string allocated



More information about the tor-commits mailing list