jruby-launcher 1.1.1-java → 1.1.2-java

data/spec/spec_helper.rb

@@ -1,81 +1,81 @@
-require 'rspec'
-require 'rbconfig'
-require 'fileutils'
-
-if defined?(JRUBY_VERSION)
-  require 'jruby'
-  JRuby.runtime.instance_config.run_ruby_in_process = false
-end
-
-module JRubyLauncherHelper
-  JRUBY_EXE = ''
-  WINDOWS = RbConfig::CONFIG['target_os'] =~ /mswin/
-
-  def self.check_executable_built
-    exe = File.expand_path("../../jruby", __FILE__) + RbConfig::CONFIG['EXEEXT']
-    unless File.executable?(exe)
-      raise "Error: launcher executable not built; type `make' before continuing."
-    end
-    top = File.dirname(exe)
-    name = File.basename(exe)
-    home = File.join(top, "build/home")
-    FileUtils.mkdir_p(File.join(home, "bin"))
-    FileUtils.cp(exe, File.join(home, "bin"))
-    if JRubyLauncherHelper::WINDOWS
-      FileUtils.cp(exe.sub(/exe/, 'dll'), File.join(home, "bin"))
-    end
-    FileUtils.mkdir_p(File.join(home, "lib"))
-    FileUtils.touch(File.join(home, "lib/jruby.jar"))
-    JRUBY_EXE.concat File.join(home, "bin", name)
-  end
-
-  def jruby_launcher(args)
-    `#{JRUBY_EXE} #{args}`
-  end
-
-  def jruby_launcher_args(args)
-    jruby_launcher("-Xcommand #{args}").split("\n")
-  end
-
-  def last_exit_code
-    $?.exitstatus
-  end
-
-  def windows?
-    WINDOWS
-  end
-
-  def classpath_arg(args)
-    index = args.index("-cp")
-    index.should > 0
-    args[index + 1]
-  end
-
-  def with_environment(pairs = {})
-    prev_env = {}
-    pairs.each_pair do |k,v|
-      prev_env[k] = ENV[k] if ENV.has_key?(k)
-      ENV[k] = v
-    end
-    begin
-      yield
-    ensure
-      pairs.keys.each {|k| ENV.delete(k)}
-      ENV.update(prev_env)
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.before(:all) do
-    JRubyLauncherHelper.check_executable_built
-    # clear environment for better control
-    ENV.delete("JAVA_HOME")
-    ENV.delete("JRUBY_HOME")
-    ENV.delete("JAVA_OPTS")
-    ENV.delete("JRUBY_OPTS")
-    ENV.delete("CLASSPATH")
-    ENV.delete("JAVA_ENCODING")
-  end
-  config.include(JRubyLauncherHelper)
-end
+require 'rspec'
+require 'rbconfig'
+require 'fileutils'
+
+if defined?(JRUBY_VERSION)
+  require 'jruby'
+  JRuby.runtime.instance_config.run_ruby_in_process = false
+end
+
+module JRubyLauncherHelper
+  JRUBY_EXE = ''
+  WINDOWS = RbConfig::CONFIG['target_os'] =~ /mswin/
+
+  def self.check_executable_built
+    exe = File.expand_path("../../jruby", __FILE__) + RbConfig::CONFIG['EXEEXT']
+    unless File.executable?(exe)
+      raise "Error: launcher executable not built; type `make' before continuing."
+    end
+    top = File.dirname(exe)
+    name = File.basename(exe)
+    home = File.join(top, "build/home")
+    FileUtils.mkdir_p(File.join(home, "bin"))
+    FileUtils.cp(exe, File.join(home, "bin"))
+    if JRubyLauncherHelper::WINDOWS
+      FileUtils.cp(exe.sub(/exe/, 'dll'), File.join(home, "bin"))
+    end
+    FileUtils.mkdir_p(File.join(home, "lib"))
+    FileUtils.touch(File.join(home, "lib/jruby.jar"))
+    JRUBY_EXE.concat File.join(home, "bin", name)
+  end
+
+  def jruby_launcher(args)
+    `#{JRUBY_EXE} #{args}`
+  end
+
+  def jruby_launcher_args(args)
+    jruby_launcher("-Xcommand #{args}").split("\n")
+  end
+
+  def last_exit_code
+    $?.exitstatus
+  end
+
+  def windows?
+    WINDOWS
+  end
+
+  def classpath_arg(args)
+    index = args.index("-cp")
+    index.should > 0
+    args[index + 1]
+  end
+
+  def with_environment(pairs = {})
+    prev_env = {}
+    pairs.each_pair do |k,v|
+      prev_env[k] = ENV[k] if ENV.has_key?(k)
+      ENV[k] = v
+    end
+    begin
+      yield
+    ensure
+      pairs.keys.each {|k| ENV.delete(k)}
+      ENV.update(prev_env)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:all) do
+    JRubyLauncherHelper.check_executable_built
+    # clear environment for better control
+    ENV.delete("JAVA_HOME")
+    ENV.delete("JRUBY_HOME")
+    ENV.delete("JAVA_OPTS")
+    ENV.delete("JRUBY_OPTS")
+    ENV.delete("CLASSPATH")
+    ENV.delete("JAVA_ENCODING")
+  end
+  config.include(JRubyLauncherHelper)
+end

data/strlcpy.c

@@ -1,72 +1,72 @@
-/*	$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <string.h>
-
-#ifdef strlcpy
-#undef strlcpy
-#endif
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-strlcpy(dst, src, siz)
-	char *dst;
-	const char *src;
-	size_t siz;
-{
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
-		do {
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
+/*	$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <string.h>
+
+#ifdef strlcpy
+#undef strlcpy
+#endif
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(dst, src, siz)
+	char *dst;
+	const char *src;
+	size_t siz;
+{
+	register char *d = dst;
+	register const char *s = src;
+	register size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0 && --n != 0) {
+		do {
+			if ((*d++ = *s++) == 0)
+				break;
+		} while (--n != 0);
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return(s - src - 1);	/* count does not include NUL */
+}

data/unixlauncher.cpp

@@ -1,100 +1,100 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include "unixlauncher.h"
-#include "utilsfuncs.h"
-
-using namespace std;
-
-extern "C" int nailgunClientMain(int argc, char *argv[], char *env[]);
-
-UnixLauncher::UnixLauncher()
-    : ArgParser()
-{
-}
-
-UnixLauncher::UnixLauncher(const UnixLauncher& orig)
-    : ArgParser(orig)
-{
-}
-
-UnixLauncher::~UnixLauncher() {
-}
-
-int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
-    platformDir = argv[0];
-    if (!initPlatformDir() || !parseArgs(argc - 1, argv + 1)) {
-        return 255;
-    }
-
-    if (nailgunClient) {
-        progArgs.push_front("org.jruby.util.NailMain");
-        char ** nailArgv = convertToArgvArray(progArgs);
-        int nailArgc = progArgs.size();
-
-        if (printCommandLine) {
-            printListToConsole(progArgs);
-            for (int i = 0; i < nailArgc; i++) {
-                free(nailArgv[i]);
-            }
-            delete[] nailArgv;
-            return 0;
-        }
-        return nailgunClientMain(progArgs.size(), (char**)nailArgv, envp);
-    }
-
-    prepareOptions();
-
-    string java("");
-
-    if (getenv("JAVACMD") != NULL) {
-        java = getenv("JAVACMD");
-    } else {
-        if (!jdkhome.empty()) {
-            java = jdkhome + "/bin/java";
-        } else if (getenv("JAVA_HOME") != NULL) {
-            string java_home = string(getenv("JAVA_HOME"));
-            java_home = trimTrailingBackslashes(java_home);
-            java = java_home + "/bin/java";
-        } else {
-            java = findOnPath("java");
-        }
-    }
-
-    if (java.empty()) {
-        printToConsole("No `java' executable found on PATH.");
-        return 255;
-    }
-
-    list<string> commandLine;
-    commandLine.push_back(java);
-    addOptionsToCommandLine(commandLine);
-
-    logMsg("Command line:");
-    for (list<string>::iterator it = commandLine.begin(); it != commandLine.end(); ++it) {
-        logMsg(it->c_str());
-    }
-
-    char** newArgv = convertToArgvArray(commandLine);
-    int newArgc = commandLine.size();
-
-    if (printCommandLine) {
-        printListToConsole(commandLine);
-        for (int i = 0; i < newArgc; i++) {
-            free(newArgv[i]);
-        }
-        delete[] newArgv;
-        return 0;
-    }
-
-    if (!fileExists(java.c_str())) {
-        string msg = "No `java' exists at " + java + ", please double-check JAVA_HOME.\n";
-        printToConsole(msg.c_str());
-        return 255;
-    }
-
-    execv(java.c_str(), newArgv);
-
-    // shouldn't get here unless something bad happened with execv
-    logErr(true, true, "execv failed:");
-    return 255;
-}
+#include <stdlib.h>
+#include <unistd.h>
+#include "unixlauncher.h"
+#include "utilsfuncs.h"
+
+using namespace std;
+
+extern "C" int nailgunClientMain(int argc, char *argv[], char *env[]);
+
+UnixLauncher::UnixLauncher()
+    : ArgParser()
+{
+}
+
+UnixLauncher::UnixLauncher(const UnixLauncher& orig)
+    : ArgParser(orig)
+{
+}
+
+UnixLauncher::~UnixLauncher() {
+}
+
+int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
+    platformDir = argv[0];
+    if (!initPlatformDir() || !parseArgs(argc - 1, argv + 1)) {
+        return 255;
+    }
+
+    if (nailgunClient) {
+        progArgs.push_front("org.jruby.util.NailMain");
+        char ** nailArgv = convertToArgvArray(progArgs);
+        int nailArgc = progArgs.size();
+
+        if (printCommandLine) {
+            printListToConsole(progArgs);
+            for (int i = 0; i < nailArgc; i++) {
+                free(nailArgv[i]);
+            }
+            delete[] nailArgv;
+            return 0;
+        }
+        return nailgunClientMain(progArgs.size(), (char**)nailArgv, envp);
+    }
+
+    prepareOptions();
+
+    string java("");
+
+    if (getenv("JAVACMD") != NULL) {
+        java = getenv("JAVACMD");
+    } else {
+        if (!jdkhome.empty()) {
+            java = jdkhome + "/bin/java";
+        } else if (getenv("JAVA_HOME") != NULL) {
+            string java_home = string(getenv("JAVA_HOME"));
+            java_home = trimTrailingBackslashes(java_home);
+            java = java_home + "/bin/java";
+        } else {
+            java = findOnPath("java");
+        }
+    }
+
+    if (java.empty()) {
+        printToConsole("No `java' executable found on PATH.");
+        return 255;
+    }
+
+    list<string> commandLine;
+    commandLine.push_back(java);
+    addOptionsToCommandLine(commandLine);
+
+    logMsg("Command line:");
+    for (list<string>::iterator it = commandLine.begin(); it != commandLine.end(); ++it) {
+        logMsg("\t%s", it->c_str());
+    }
+
+    char** newArgv = convertToArgvArray(commandLine);
+    int newArgc = commandLine.size();
+
+    if (printCommandLine) {
+        printListToConsole(commandLine);
+        for (int i = 0; i < newArgc; i++) {
+            free(newArgv[i]);
+        }
+        delete[] newArgv;
+        return 0;
+    }
+
+    if (!fileExists(java.c_str())) {
+        string msg = "No `java' exists at " + java + ", please double-check JAVA_HOME.\n";
+        printToConsole(msg.c_str());
+        return 255;
+    }
+
+    execv(java.c_str(), newArgv);
+
+    // shouldn't get here unless something bad happened with execv
+    logErr(true, true, "execv failed:");
+    return 255;
+}