From 4de2ff4cbd16423439470a128bf5f00bb9d0a7d0 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 21 Jun 2017 05:20:33 -0600
Subject: [PATCH] fix `make-file-or-directory-link`

---
 racket/src/racket/src/file.c |  7 ++++---
 racket/src/rktio/rktio_fs.c  | 10 ++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/racket/src/racket/src/file.c b/racket/src/racket/src/file.c
index 261c32d46e..7fb71d5120 100644
--- a/racket/src/racket/src/file.c
+++ b/racket/src/racket/src/file.c
@@ -4723,7 +4723,7 @@ static Scheme_Object *make_link(int argc, Scheme_Object *argv[])
   if (!rktio_make_link(scheme_rktio, src, SCHEME_PATH_VAL(dest), dest_is_dir)) {
     if (scheme_last_error_is_racket(RKTIO_ERROR_EXISTS)) {
       scheme_raise_exn(MZEXN_FAIL_FILESYSTEM_EXISTS,
-                       "make-file-or-directory-link: cannot make directory;\n"
+                       "make-file-or-directory-link: cannot make link;\n"
                        " the path already exists\n"
                        "  path: %q",
                        filename_for_error(argv[0]));
@@ -4731,11 +4731,12 @@ static Scheme_Object *make_link(int argc, Scheme_Object *argv[])
       scheme_raise_exn(MZEXN_FAIL_FILESYSTEM,
                        "make-file-or-directory-link: cannot make link\n"
                        "  path: %q\n"
-                       "  system error: %R");
+                       "  system error: %R",
+                       filename_for_error(argv[0]));
     }
   }
 
-  return NULL;
+  return scheme_void;
 }
 
 static Scheme_Object *file_modify_seconds(int argc, Scheme_Object **argv)
diff --git a/racket/src/rktio/rktio_fs.c b/racket/src/rktio/rktio_fs.c
index eabc977a67..bbb6fc22d8 100644
--- a/racket/src/rktio/rktio_fs.c
+++ b/racket/src/rktio/rktio_fs.c
@@ -1038,7 +1038,10 @@ int rktio_make_link(rktio_t *rktio, const char *src, const char *dest, int dest_
       free(src_w);
       return 1;
     }
-    get_windows_error();
+    if (GetLastError() == ERROR_ALREADY_EXISTS)
+      set_racket_error(RKTIO_ERROR_EXISTS);
+    else
+      get_windows_error();
     free(src_w);
   } else
     set_racket_error(RKTIO_ERROR_UNSUPPORTED);
@@ -1051,7 +1054,10 @@ int rktio_make_link(rktio_t *rktio, const char *src, const char *dest, int dest_
     else if (errno != EINTR)
       break;
   }
-  get_posix_error();
+  if (errno == EEXIST)
+    set_racket_error(RKTIO_ERROR_EXISTS);
+  else
+    get_posix_error();
   return 0;
 #endif
 }