windows: add dirname term to build, fix some paths

Fixes up some windows path issues.  I believe that the only
test failures now are just path expectations in the php tests,
and because we don't currently have pcre support in the
windows build.

Ref: facebook#19

arcanist/lib/WatchmanTestCase.php

@@ -3,6 +3,9 @@
  * Licensed under the Apache License, Version 2.0 */
 
 function w_normalize_filename($a) {
+  if ($a === null) {
+    return null;
+  }
   return str_replace('/', DIRECTORY_SEPARATOR, $a);
 }
 

cmds/watch.c

@@ -129,7 +129,8 @@ static bool find_file_in_dir_tree(const char *root_file, char *candidate_dir,
     char *proj_path;
     int rv;
 
-    ignore_result(asprintf(&proj_path, "%s/%s", candidate_dir, root_file));
+    ignore_result(asprintf(&proj_path, "%s%c%s", candidate_dir,
+          WATCHMAN_DIR_SEP, root_file));
     rv = w_path_exists(proj_path);
     free(proj_path);
 
@@ -144,14 +145,27 @@ static bool find_file_in_dir_tree(const char *root_file, char *candidate_dir,
     }
 
     // Walk up to the next level
+#ifdef _WIN32
+    if (strlen(candidate_dir) == 3 &&
+        candidate_dir[1] == ':' && candidate_dir[2] == '\\') {
+      // Drive letter; is a root
+      break;
+    }
+    if (strlen(candidate_dir) <= 2) {
+      // Effectively a root
+      break;
+    }
+#else
     if (!strcmp(candidate_dir, "/")) {
       // Can't go any higher than this
       break;
     }
+#endif
+
 
-    slash = strrchr(candidate_dir, '/');
+    slash = strrchr(candidate_dir, WATCHMAN_DIR_SEP);
     if (restore_slash) {
-      *restore_slash = '/';
+      *restore_slash = WATCHMAN_DIR_SEP;
     }
     if (!slash) {
       break;
@@ -161,7 +175,7 @@ static bool find_file_in_dir_tree(const char *root_file, char *candidate_dir,
   }
 
   if (restore_slash) {
-    *restore_slash = '/';
+    *restore_slash = WATCHMAN_DIR_SEP;
   }
   *relpath = NULL;
   return false;

query/dirname.c

@@ -18,6 +18,10 @@ static void dispose_dirname(void *ptr) {
   free(data);
 }
 
+static inline bool is_dir_sep(int c) {
+  return c == '/' || c == '\\';
+}
+
 static bool eval_dirname(struct w_query_ctx *ctx,
     struct watchman_file *file, void *ptr) {
   struct dirname_data *data = ptr;
@@ -39,7 +43,8 @@ static bool eval_dirname(struct w_query_ctx *ctx,
   // Want to make sure that wholename is a child of dirname, so
   // check for a dir separator.  Special case for dirname == '' (the root),
   // which won't have a slash in position 0.
-  if (data->dirname->len > 0 && str->buf[data->dirname->len] != '/') {
+  if (data->dirname->len > 0 &&
+      !is_dir_sep(str->buf[data->dirname->len])) {
     // may have a common prefix with, but is not a child of dirname
     return false;
   }
@@ -51,7 +56,7 @@ static bool eval_dirname(struct w_query_ctx *ctx,
   // Now compute the depth of file from dirname.  We do this by
   // counting dir separators, not including the one we saw above.
   for (i = data->dirname->len + 1; i < str->len; i++) {
-    if (str->buf[i] == '/') {
+    if (is_dir_sep(str->buf[i])) {
       depth++;
     }
   }

root.c

@@ -769,6 +769,7 @@ static w_string_t *w_resolve_filesystem_canonical_name(const char *path)
   if (long_len == 0 && err == ERROR_FILE_NOT_FOUND) {
     // signal to caller that the file has disappeared -- the caller will read
     // errno and do error handling
+    errno = map_win32_err(err);
     return NULL;
   }
 

tests/integration/trigger-chdir.php

@@ -89,6 +89,7 @@ function testChdirRelativeRoot() {
     $this->waitFor(
       function () use ($env, $root) {
         $envdata = @file_get_contents($env);
+        $root = preg_quote($root);
         return preg_match(",PWD=$root/sub,", $envdata) == 1;
       },
       10,

tests/integration/watchproject.php

@@ -6,7 +6,7 @@ class watchProjectTestCaseHelper extends WatchmanTestCase {
   function runProjectTests($tests, $touch_watchmanconfig = false) {
     foreach ($tests as $info) {
       list($touch, $expected_watch, $expect_rel, $expected_pass) = $info;
-      $dir = PhutilDirectoryFixture::newEmptyFixture();
+      $dir = new WatchmanDirectoryFixture();
       $root = realpath($dir->getPath());
 
       mkdir("$root/a/b/c", 0777, true);
@@ -30,8 +30,10 @@ function runProjectTests($tests, $touch_watchmanconfig = false) {
         if ($err) {
           $this->assertFailure("failed to watch-project: $err");
         }
-        $this->assertEqual($full_watch, idx($res, 'watch'), $label);
-        $this->assertEqual($expect_rel, idx($res, 'relative_path'), $label);
+        $this->assertEqual(w_normalize_filename($full_watch),
+            idx($res, 'watch'), $label);
+        $this->assertEqual(w_normalize_filename($expect_rel),
+            idx($res, 'relative_path'), $label);
       } else {
         if ($err) {
           $this->assertEqual(

winbuild/Makefile

@@ -19,6 +19,7 @@ JSON_SRCS=\
 
 SRCS=\
 	$(JSON_SRCS) \
+	winbuild\abort.c \
 	winbuild\errmap.c \
 	winbuild\pathmap.c \
 	winbuild\stat.c \
@@ -58,13 +59,15 @@ SRCS=\
 	cmds\debug.c    \
 	query\base.c       \
 	query\parse.c      \
+	query\dirname.c    \
 	query\eval.c       \
 	query\type.c       \
 	query\suffix.c     \
 	query\match.c      \
 	query\pcre.c       \
 	query\name.c       \
 	query\fieldlist.c  \
+	query\intcompare.c  \
 	query\since.c      \
 	query\empty.c      \
 	watcher\win32.c \
@@ -82,6 +85,7 @@ TEST_SRCS=\
 	winbuild\time.c \
 	winbuild\pthread.c \
 	winbuild\backtrace.c \
+	winbuild\abort.c \
 	argv.c \
 	$(JSON_SRCS)
 

winbuild/abort.c

@@ -0,0 +1,13 @@
+/* Copyright 2015-present Facebook, Inc.
+ * Licensed under the Apache License, Version 2.0 */
+
+#include "watchman.h"
+
+// We do our own abort because the standard implementation invokes
+// troubleshooting UI that the user won't care about, and because
+// this actually doesn't work properly in our test harness
+void w_abort(void) {
+  ignore_result(write(STDERR_FILENO, "aborting\n",
+        (int)strlen("aborting\n")));
+  exit(1);
+}

winbuild/config.h

@@ -33,6 +33,10 @@
 #include <io.h>
 #include <sys/types.h>
 
+// Use our own abort implementation
+#define abort() w_abort()
+extern void w_abort(void);
+
 typedef ptrdiff_t ssize_t;
 
 #define WATCHMAN_DIR_SEP '\\'