1 files changed, 31 insertions, 49 deletions

diff --git a/ruby-runner.c b/ruby-runner.c
index 48acf4396e..99be4a0013 100644
--- a/ruby-runner.c
+++ b/ruby-runner.c
@@ -1,18 +1,13 @@
 #define _POSIX_C_SOURCE 200809L
-#include "ruby/internal/config.h"
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef _WIN32
-# error This feature is unnecessary on Windows in favor of SxS.
-#endif
 
 #include "ruby-runner.h"
 
+#define STRINGIZE(expr) STRINGIZE0(expr)
+#define STRINGIZE0(expr) #expr
+
 static void
 insert_env_path(const char *envname, const char *paths, size_t size, int prepend)
 {
@@ -21,41 +16,29 @@ insert_env_path(const char *envname, const char *paths, size_t size, int prepend
     size_t n = 0;
 
     if (env) {
-        while ((c = *env) == PATH_SEP) ++env;
-        n = strlen(env);
-        while (n > 0 && env[n-1] == PATH_SEP) --n;
+	while ((c = *env) == PATH_SEP) ++env;
+	n = strlen(env);
+	while (n > 0 && env[n-1] == PATH_SEP) --n;
     }
     if (c) {
-        char *e = malloc(size+n+1);
-        size_t pos = 0;
-        if (prepend) {
-            if (size == n || (size < n && env[size] == PATH_SEP)) {
-                if (strncmp(paths, env, size) == 0) {
-                    free(e);
-                    return;
-                }
-            }
-            memcpy(e, paths, pos = size-1);
-            e[pos++] = PATH_SEP;
-        }
-        memcpy(e+pos, env, n);
-        pos += n;
-        if (!prepend) {
-            if (size == n || (size < n && env[n-size-1] == PATH_SEP)) {
-                if (strncmp(paths, &env[n-size], size) == 0) {
-                    free(e);
-                    return;
-                }
-            }
-            e[pos++] = PATH_SEP;
-            memcpy(e+pos, paths, size-1);
-            pos += size-1;
-        }
-        e[pos] = '\0';
-        env = e;
+	char *e = malloc(size+n+1);
+	size_t pos = 0;
+	if (prepend) {
+	    memcpy(e, paths, pos = size-1);
+	    e[pos++] = PATH_SEP;
+	}
+	memcpy(e+pos, env, n);
+	pos += n;
+	if (!prepend) {
+	    e[pos++] = PATH_SEP;
+	    memcpy(e+pos, paths, size-1);
+	    pos += size-1;
+	}
+	e[pos] = '\0';
+	env = e;
     }
     else {
-        env = paths;
+	env = paths;
     }
     setenv(envname, env, 1);
 }
@@ -67,12 +50,12 @@ main(int argc, char **argv)
     static const char builddir[] = BUILDDIR;
     static const char rubypath[] = BUILDDIR"/"STRINGIZE(RUBY_INSTALL_NAME);
     static const char rubylib[] =
-        ABS_SRCDIR"/lib"
-        PATH_SEPARATOR
-        EXTOUT_DIR"/common"
-        PATH_SEPARATOR
-        EXTOUT_DIR"/"ARCH
-        ;
+	ABS_SRCDIR"/lib"
+	PATH_SEPARATOR
+	EXTOUT_DIR"/common"
+	PATH_SEPARATOR
+	EXTOUT_DIR"/"ARCH
+	;
     const size_t dirsize = sizeof(builddir);
     const size_t namesize = sizeof(rubypath) - dirsize;
     const char *rubyname = rubypath + dirsize;
@@ -83,13 +66,12 @@ main(int argc, char **argv)
 
     if (!(p = strrchr(arg0, '/'))) p = arg0; else p++;
     if (strlen(p) < namesize - 1) {
-        argv[0] = malloc(p - arg0 + namesize);
-        memcpy(argv[0], arg0, p - arg0);
-        p = argv[0] + (p - arg0);
+	argv[0] = malloc(p - arg0 + namesize);
+	memcpy(argv[0], arg0, p - arg0);
+	p = argv[0] + (p - arg0);
     }
     memcpy(p, rubyname, namesize);
 
     execv(rubypath, argv);
-    perror(rubypath);
     return -1;
 }