Added cygpath for cygwin file paths

Author: jkutner

mrblib/jruby_opts_parser.rb

@@ -129,6 +129,9 @@ def parse(opts)
         @ruby_opts << opt
       else
         # Abort processing on first non-opt arg
+        if JRubySupport.is_cygwin? and opt.start_with?("/")
+          opt = JRubySupport.cygpath(opt).strip
+        end
         @ruby_opts << opt
         @ruby_opts += opts
         opts.clear

src/jruby_support.c

@@ -9,6 +9,9 @@
 #include "mruby/ext/io.h"
 
 #if defined(_WIN32) || defined(_WIN64)
+  #include <windows.h>
+  #include <stdio.h>
+  #include <string.h>
   #define SYSTEM_SHELL "cmd.exe"
   #define DEFAULT_JAVA_OPTS ""
   #define IS_WINDOWS "true"
@@ -22,12 +25,39 @@
   #define IS_WINDOWS "false"
 #endif
 
+mrb_value mrb_cygpath(mrb_state *mrb)
+{
+#if defined(_WIN32) || defined(_WIN64)
+  char *windowsPath = NULL;
+  char psBuffer[128];
+  FILE *pPipe;
+  mrb_value *argv;
+  mrb_int argc;
+  char cmd[32*1024] = "cygpath -w -p ";
+
+  mrb_get_args(mrb, "*", &argv, &argc);
+
+  const char *cygwinPath = mrb_string_value_cstr(mrb, &argv[0]);
+  strcat(cmd, cygwinPath);
+
+  if( (pPipe = _popen(cmd, "rt")) == NULL )
+    mrb_raise(mrb, E_RUNTIME_ERROR, "Could not execute cygpath");
+
+  windowsPath = fgets(psBuffer, 128, pPipe);
+  _pclose(pPipe);
+
+  return mrb_str_new_cstr(mrb, windowsPath);
+#else
+  mrb_raise(mrb, E_RUNTIME_ERROR, "Could not execute cygpath outside of Windows");
+#endif
+}
+
 mrb_bool mrb_is_windows(mrb_state *mrb)
 {
 #if defined(_WIN32) || defined(_WIN64)
   return TRUE;
 #else
-  return NULL;
+  return FALSE;
 #endif
 }
 
@@ -37,6 +67,8 @@ mrb_init_jruby_support(mrb_state *mrb)
   struct RClass *c;
   c = mrb_define_class(mrb, "JRubySupport", mrb->object_class);
 
+  mrb_define_class_method(mrb, c, "cygpath", mrb_cygpath, MRB_ARGS_ANY());
+
   mrb_define_const(mrb, c, "IS_WINDOWS", mrb_str_new_cstr(mrb, IS_WINDOWS));
   mrb_define_const(mrb, c, "SYSTEM_SHELL", mrb_str_new_cstr(mrb, SYSTEM_SHELL));
   mrb_define_const(mrb, c, "DEFAULT_JAVA_OPTS", mrb_str_new_cstr(mrb, DEFAULT_JAVA_OPTS));