[or-cvs] Make unit tests work on win32

[nickm@seul.org (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv19864/src/or

Modified Files:
	main.c or.h test.c 
Log Message:
Make unit tests work on win32

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -d -r1.400 -r1.401
--- main.c	1 Dec 2004 03:48:13 -0000	1.400
+++ main.c	7 Dec 2004 05:31:37 -0000	1.401
@@ -1011,7 +1011,7 @@
 /** Called before we make any calls to network-related functions.
  * (Some operating systems require their network libraries to be
  * initialized.) */
-static int network_init(void)
+int network_init(void)
 {
 #ifdef MS_WINDOWS
   /* This silly exercise is necessary before windows will allow gethostbyname to work.

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -d -r1.505 -r1.506
--- or.h	5 Dec 2004 07:10:08 -0000	1.505
+++ or.h	7 Dec 2004 05:31:37 -0000	1.506
@@ -1387,6 +1387,7 @@
 
 void handle_signals(int is_parent);
 void tor_cleanup(void);
+int network_init(void);
 
 int tor_main(int argc, char *argv[]);
 

Index: test.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/test.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- test.c	4 Dec 2004 01:14:36 -0000	1.157
+++ test.c	7 Dec 2004 05:31:38 -0000	1.158
@@ -4,6 +4,7 @@
 /* $Id$ */
 const char test_c_id[] = "$Id$";
 
+#include "orconfig.h"
 #include <stdio.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
@@ -12,8 +13,10 @@
 #ifdef MS_WINDOWS
 /* For mkdir() */
 #include <direct.h>
-#endif
+#else
 #include <dirent.h>
+#endif
+
 #include "or.h"
 #include "../common/test.h"
 #include "../common/torgzip.h"
@@ -34,10 +37,12 @@
   int r;
   if (is_setup) return;
 
-  tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d", (int) getpid());
 #ifdef MS_WINDOWS
+  // XXXX
+  tor_snprintf(temp_dir, sizeof(temp_dir), "c:\\windows\\temp\\tor_test_%d", (int)getpid()); 
   r = mkdir(temp_dir);
 #else
+  tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d", (int) getpid());
   r = mkdir(temp_dir, 0700);
 #endif
   if (r) {
@@ -60,6 +65,35 @@
 static void
 remove_directory(void)
 {
+#ifdef MS_WINDOWS
+  char *pattern;
+  HANDLE handle;
+  WIN32_FIND_DATA findData;
+
+  setup_directory();
+  pattern = tor_malloc(strlen(temp_dir)+16);
+  tor_snprintf(pattern, strlen(temp_dir)+16, "%s\\*", temp_dir);
+  handle = FindFirstFile(pattern, &findData);
+  if (handle == INVALID_HANDLE_VALUE) {
+    perror("Can't remove");
+    return;
+  }
+  while(1) {
+    size_t dlen = strlen(findData.cFileName)+strlen(temp_dir)+16;
+    char *deleteable = tor_malloc(dlen);
+    tor_snprintf(deleteable, dlen, "%s\\%s", temp_dir, findData.cFileName);
+    unlink(deleteable);
+    tor_free(deleteable);
+    if (!FindNextFile(handle, &findData)) {
+      if (GetLastError() != ERROR_NO_MORE_FILES) {
+        perror("error reading dir");
+      }
+      break;
+    }
+  }
+  FindClose(handle);
+  tor_free(pattern);
+#else
   DIR *dirp;
   struct dirent *de;
   setup_directory();
@@ -78,6 +112,7 @@
 #endif
   }
   closedir(dirp);
+#endif
   rmdir(temp_dir);
 }
 
@@ -1239,6 +1274,7 @@
 int
 main(int c, char**v) {
   or_options_t *options = tor_malloc_zero(sizeof(or_options_t));
+  network_init();
   options_init(options);
   set_options(options);