jruby-launcher 1.1.1-java → 1.1.2-java

data/platformlauncher.h

@@ -1,73 +1,73 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2009-2012 JRuby Team (www.jruby.org).
- * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Author: Tomas Holy
- */
-
-#ifndef _PLATFORMLAUNCHER_H
-#define _PLATFORMLAUNCHER_H
-
-#include "jvmlauncher.h"
-#include "argparser.h"
-
-class PlatformLauncher : public ArgParser {
-public:
-    PlatformLauncher();
-    virtual ~PlatformLauncher();
-
-    bool start(char* argv[], int argc, DWORD *retCode, const char *name);
-    void onExit();
-
-    void setSuppressConsole(bool val) {
-        suppressConsole = val;
-    }
-
-private:
-    PlatformLauncher(const PlatformLauncher& orig);
-    bool run(DWORD *retCode);
-    bool checkJDKHome();
-
-private:
-    bool suppressConsole;
-    JvmLauncher jvmLauncher;
-};
-
-#endif  /* _PLATFORMLAUNCHER_H */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009-2012 JRuby Team (www.jruby.org).
+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Author: Tomas Holy
+ */
+
+#ifndef _PLATFORMLAUNCHER_H
+#define _PLATFORMLAUNCHER_H
+
+#include "jvmlauncher.h"
+#include "argparser.h"
+
+class PlatformLauncher : public ArgParser {
+public:
+    PlatformLauncher();
+    virtual ~PlatformLauncher();
+
+    bool start(char* argv[], int argc, DWORD *retCode, const char *name);
+    void onExit();
+
+    void setSuppressConsole(bool val) {
+        suppressConsole = val;
+    }
+
+private:
+    PlatformLauncher(const PlatformLauncher& orig);
+    bool run(DWORD *retCode);
+    bool checkJDKHome();
+
+private:
+    bool suppressConsole;
+    JvmLauncher jvmLauncher;
+};
+
+#endif  /* _PLATFORMLAUNCHER_H */

data/rb_w32_cmdvector.h

@@ -1,287 +1,287 @@
-/*
- *  Copyright (c) 1993, Intergraph Corporation
- *
- *  You may distribute under the terms of either the GNU General Public
- *  License or the Artistic License, as specified in the perl README file.
- *
- *  Various Unix compatibility functions and NT specific functions.
- *
- *  Some of this code was derived from the MSDOS port(s) and the OS/2 port.
- *
- */
-
-#include <windows.h>
-
-#ifndef _RB_W32_CMDVECTOR_H
-#define	_RB_W32_CMDVECTOR_H
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#define MAXPATHLEN 512
-#define NTMALLOC 0x2	// string in element was malloc'ed
-
-#define isascii(c) ( (c>=0x00&&c<=0x7f)?1:0 )
-#define isspace(c) ( ((c>=0x09&&c<=0x0d)||c==0x20)?1:0 )
-#define ISASCII(c) isascii((int)(unsigned char)(c))
-#define ISSPACE(c) (ISASCII(c) && isspace((int)(unsigned char)(c)))
-
-static inline char * skipspace(char *ptr) {
-    while (ISSPACE(*ptr))
-	ptr++;
-    return ptr;
-}
-
-typedef struct _NtCmdLineElement {
-    struct _NtCmdLineElement *next;
-    char *str;
-    int len;
-    int flags;
-} NtCmdLineElement;
-
-
-int strlcpy(char *dst, const char *src, size_t siz);
-
-// NOTE: this method is taken from MRI source basically verbatim,
-// to preserve compatibility
-int rb_w32_cmdvector(const char *cmd, char ***vec) {
-    int globbing, len;
-    int elements, strsz, done;
-    int slashes, escape;
-    char *ptr, *base, *buffer, *cmdline;
-    char **vptr;
-    char quote;
-    NtCmdLineElement *curr, **tail;
-    NtCmdLineElement *cmdhead = NULL, **cmdtail = &cmdhead;
-
-    //
-    // just return if we don't have a command line
-    //
-
-    while (ISSPACE(*cmd))
-	cmd++;
-    if (!*cmd) {
-	*vec = NULL;
-	return 0;
-    }
-
-    ptr = cmdline = strdup(cmd);
-
-    //
-    // Ok, parse the command line, building a list of CmdLineElements.
-    // When we've finished, and it's an input command (meaning that it's
-    // the processes argv), we'll do globing and then build the argument
-    // vector.
-    // The outer loop does one interation for each element seen.
-    // The inner loop does one interation for each character in the element.
-    //
-
-    while (*(ptr = skipspace(ptr))) {
-	base = ptr;
-	quote = slashes = globbing = escape = 0;
-	for (done = 0; !done && *ptr; ) {
-	    //
-	    // Switch on the current character. We only care about the
-	    // white-space characters, the  wild-card characters, and the
-	    // quote characters.
-	    //
-
-	    switch (*ptr) {
-	      case '\\':
-		if (quote != '\'') slashes++;
-	        break;
-
-	      case ' ':
-	      case '\t':
-	      case '\n':
-		//
-		// if we're not in a string, then we're finished with this
-		// element
-		//
-
-		if (!quote) {
-		    *ptr = 0;
-		    done = 1;
-		}
-		break;
-
-	      case '*':
-	      case '?':
-	      case '[':
-	      case '{':
-		//
-		// record the fact that this element has a wildcard character
-		// N.B. Don't glob if inside a single quoted string
-		//
-
-		if (quote != '\'')
-		    globbing++;
-		slashes = 0;
-		break;
-
-	      case '\'':
-	      case '\"':
-		//
-		// if we're already in a string, see if this is the
-		// terminating close-quote. If it is, we're finished with
-		// the string, but not neccessarily with the element.
-		// If we're not already in a string, start one.
-		//
-
-		if (!(slashes & 1)) {
-		    if (!quote)
-			quote = *ptr;
-		    else if (quote == *ptr) {
-			if (quote == '"' && quote == ptr[1])
-			    ptr++;
-			quote = '\0';
-		    }
-		}
-		escape++;
-		slashes = 0;
-		break;
-
-	      default:
-		ptr = CharNext(ptr);
-		slashes = 0;
-		continue;
-	    }
-	    ptr++;
-	}
-
-	//
-	// when we get here, we've got a pair of pointers to the element,
-	// base and ptr. Base points to the start of the element while ptr
-	// points to the character following the element.
-	//
-
-	len = ptr - base;
-	if (done) --len;
-
-	//
-	// if it's an input vector element and it's enclosed by quotes,
-	// we can remove them.
-	//
-
-	if (escape) {
-	    char *p = base, c;
-	    slashes = quote = 0;
-	    while (p < base + len) {
-		switch (c = *p) {
-		  case '\\':
-		    p++;
-		    if (quote != '\'') slashes++;
-		    break;
-
-		  case '\'':
-		  case '"':
-		    if (!(slashes & 1) && quote && quote != c) {
-			p++;
-			slashes = 0;
-			break;
-		    }
-		    memcpy(p - ((slashes + 1) >> 1), p + (~slashes & 1),
-			   base + len - p);
-		    len -= ((slashes + 1) >> 1) + (~slashes & 1);
-		    p -= (slashes + 1) >> 1;
-		    if (!(slashes & 1)) {
-			if (quote) {
-			    if (quote == '"' && quote == *p)
-				p++;
-			    quote = '\0';
-			}
-			else
-			    quote = c;
-		    }
-		    else
-			p++;
-		    slashes = 0;
-		    break;
-
-		  default:
-		    p = CharNext(p);
-		    slashes = 0;
-		    break;
-		}
-	    }
-	}
-
-	curr = (NtCmdLineElement *)calloc(sizeof(NtCmdLineElement), 1);
-	if (!curr) goto do_nothing;
-	curr->str = base;
-	curr->len = len;
-
-        // TODO: globbing!
-//	if (globbing && (tail = cmdglob(curr, cmdtail))) {
-//	    cmdtail = tail;
-//	}
-//	else {
-	    *cmdtail = curr;
-	    cmdtail = &curr->next;
-//	}
-    }
-
-    //
-    // Almost done!
-    // Count up the elements, then allocate space for a vector of pointers
-    // (argv) and a string table for the elements.
-    //
-
-    for (elements = 0, strsz = 0, curr = cmdhead; curr; curr = curr->next) {
-	elements++;
-	strsz += (curr->len + 1);
-    }
-
-    len = (elements+1)*sizeof(char *) + strsz;
-    buffer = (char *)malloc(len);
-    if (!buffer) {
-      do_nothing:
-	while (curr = cmdhead) {
-	    cmdhead = curr->next;
-	    if (curr->flags & NTMALLOC) free(curr->str);
-	    free(curr);
-	}
-	free(cmdline);
-	for (vptr = *vec; *vptr; ++vptr);
-	return vptr - *vec;
-    }
-
-    //
-    // make vptr point to the start of the buffer
-    // and ptr point to the area we'll consider the string table.
-    //
-    //   buffer (*vec)
-    //   |
-    //   V       ^---------------------V
-    //   +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    //   |   |       | ....  | NULL  |   | ..... |\0 |   | ..... |\0 |...
-    //   +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    //   |-  elements+1             -| ^ 1st element   ^ 2nd element
-
-    vptr = (char **) buffer;
-
-    ptr = buffer + (elements+1) * sizeof(char *);
-
-    while (curr = cmdhead) {
-	strlcpy(ptr, curr->str, curr->len + 1);
-	*vptr++ = ptr;
-	ptr += curr->len + 1;
-	cmdhead = curr->next;
-	if (curr->flags & NTMALLOC) free(curr->str);
-	free(curr);
-    }
-    *vptr = 0;
-
-    *vec = (char **) buffer;
-    free(cmdline);
-    return elements;
-}
-
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _RB_W32_CMDVECTOR_H */
-
+/*
+ *  Copyright (c) 1993, Intergraph Corporation
+ *
+ *  You may distribute under the terms of either the GNU General Public
+ *  License or the Artistic License, as specified in the perl README file.
+ *
+ *  Various Unix compatibility functions and NT specific functions.
+ *
+ *  Some of this code was derived from the MSDOS port(s) and the OS/2 port.
+ *
+ */
+
+#include <windows.h>
+
+#ifndef _RB_W32_CMDVECTOR_H
+#define	_RB_W32_CMDVECTOR_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define MAXPATHLEN 512
+#define NTMALLOC 0x2	// string in element was malloc'ed
+
+#define isascii(c) ( (c>=0x00&&c<=0x7f)?1:0 )
+#define isspace(c) ( ((c>=0x09&&c<=0x0d)||c==0x20)?1:0 )
+#define ISASCII(c) isascii((int)(unsigned char)(c))
+#define ISSPACE(c) (ISASCII(c) && isspace((int)(unsigned char)(c)))
+
+static inline char * skipspace(char *ptr) {
+    while (ISSPACE(*ptr))
+	ptr++;
+    return ptr;
+}
+
+typedef struct _NtCmdLineElement {
+    struct _NtCmdLineElement *next;
+    char *str;
+    int len;
+    int flags;
+} NtCmdLineElement;
+
+
+int strlcpy(char *dst, const char *src, size_t siz);
+
+// NOTE: this method is taken from MRI source basically verbatim,
+// to preserve compatibility
+int rb_w32_cmdvector(const char *cmd, char ***vec) {
+    int globbing, len;
+    int elements, strsz, done;
+    int slashes, escape;
+    char *ptr, *base, *buffer, *cmdline;
+    char **vptr;
+    char quote;
+    NtCmdLineElement *curr, **tail;
+    NtCmdLineElement *cmdhead = NULL, **cmdtail = &cmdhead;
+
+    //
+    // just return if we don't have a command line
+    //
+
+    while (ISSPACE(*cmd))
+	cmd++;
+    if (!*cmd) {
+	*vec = NULL;
+	return 0;
+    }
+
+    ptr = cmdline = strdup(cmd);
+
+    //
+    // Ok, parse the command line, building a list of CmdLineElements.
+    // When we've finished, and it's an input command (meaning that it's
+    // the processes argv), we'll do globing and then build the argument
+    // vector.
+    // The outer loop does one interation for each element seen.
+    // The inner loop does one interation for each character in the element.
+    //
+
+    while (*(ptr = skipspace(ptr))) {
+	base = ptr;
+	quote = slashes = globbing = escape = 0;
+	for (done = 0; !done && *ptr; ) {
+	    //
+	    // Switch on the current character. We only care about the
+	    // white-space characters, the  wild-card characters, and the
+	    // quote characters.
+	    //
+
+	    switch (*ptr) {
+	      case '\\':
+		if (quote != '\'') slashes++;
+	        break;
+
+	      case ' ':
+	      case '\t':
+	      case '\n':
+		//
+		// if we're not in a string, then we're finished with this
+		// element
+		//
+
+		if (!quote) {
+		    *ptr = 0;
+		    done = 1;
+		}
+		break;
+
+	      case '*':
+	      case '?':
+	      case '[':
+	      case '{':
+		//
+		// record the fact that this element has a wildcard character
+		// N.B. Don't glob if inside a single quoted string
+		//
+
+		if (quote != '\'')
+		    globbing++;
+		slashes = 0;
+		break;
+
+	      case '\'':
+	      case '\"':
+		//
+		// if we're already in a string, see if this is the
+		// terminating close-quote. If it is, we're finished with
+		// the string, but not neccessarily with the element.
+		// If we're not already in a string, start one.
+		//
+
+		if (!(slashes & 1)) {
+		    if (!quote)
+			quote = *ptr;
+		    else if (quote == *ptr) {
+			if (quote == '"' && quote == ptr[1])
+			    ptr++;
+			quote = '\0';
+		    }
+		}
+		escape++;
+		slashes = 0;
+		break;
+
+	      default:
+		ptr = CharNext(ptr);
+		slashes = 0;
+		continue;
+	    }
+	    ptr++;
+	}
+
+	//
+	// when we get here, we've got a pair of pointers to the element,
+	// base and ptr. Base points to the start of the element while ptr
+	// points to the character following the element.
+	//
+
+	len = ptr - base;
+	if (done) --len;
+
+	//
+	// if it's an input vector element and it's enclosed by quotes,
+	// we can remove them.
+	//
+
+	if (escape) {
+	    char *p = base, c;
+	    slashes = quote = 0;
+	    while (p < base + len) {
+		switch (c = *p) {
+		  case '\\':
+		    p++;
+		    if (quote != '\'') slashes++;
+		    break;
+
+		  case '\'':
+		  case '"':
+		    if (!(slashes & 1) && quote && quote != c) {
+			p++;
+			slashes = 0;
+			break;
+		    }
+		    memcpy(p - ((slashes + 1) >> 1), p + (~slashes & 1),
+			   base + len - p);
+		    len -= ((slashes + 1) >> 1) + (~slashes & 1);
+		    p -= (slashes + 1) >> 1;
+		    if (!(slashes & 1)) {
+			if (quote) {
+			    if (quote == '"' && quote == *p)
+				p++;
+			    quote = '\0';
+			}
+			else
+			    quote = c;
+		    }
+		    else
+			p++;
+		    slashes = 0;
+		    break;
+
+		  default:
+		    p = CharNext(p);
+		    slashes = 0;
+		    break;
+		}
+	    }
+	}
+
+	curr = (NtCmdLineElement *)calloc(sizeof(NtCmdLineElement), 1);
+	if (!curr) goto do_nothing;
+	curr->str = base;
+	curr->len = len;
+
+        // TODO: globbing!
+//	if (globbing && (tail = cmdglob(curr, cmdtail))) {
+//	    cmdtail = tail;
+//	}
+//	else {
+	    *cmdtail = curr;
+	    cmdtail = &curr->next;
+//	}
+    }
+
+    //
+    // Almost done!
+    // Count up the elements, then allocate space for a vector of pointers
+    // (argv) and a string table for the elements.
+    //
+
+    for (elements = 0, strsz = 0, curr = cmdhead; curr; curr = curr->next) {
+	elements++;
+	strsz += (curr->len + 1);
+    }
+
+    len = (elements+1)*sizeof(char *) + strsz;
+    buffer = (char *)malloc(len);
+    if (!buffer) {
+      do_nothing:
+	while (curr = cmdhead) {
+	    cmdhead = curr->next;
+	    if (curr->flags & NTMALLOC) free(curr->str);
+	    free(curr);
+	}
+	free(cmdline);
+	for (vptr = *vec; *vptr; ++vptr);
+	return vptr - *vec;
+    }
+
+    //
+    // make vptr point to the start of the buffer
+    // and ptr point to the area we'll consider the string table.
+    //
+    //   buffer (*vec)
+    //   |
+    //   V       ^---------------------V
+    //   +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    //   |   |       | ....  | NULL  |   | ..... |\0 |   | ..... |\0 |...
+    //   +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    //   |-  elements+1             -| ^ 1st element   ^ 2nd element
+
+    vptr = (char **) buffer;
+
+    ptr = buffer + (elements+1) * sizeof(char *);
+
+    while (curr = cmdhead) {
+	strlcpy(ptr, curr->str, curr->len + 1);
+	*vptr++ = ptr;
+	ptr += curr->len + 1;
+	cmdhead = curr->next;
+	if (curr->flags & NTMALLOC) free(curr->str);
+	free(curr);
+    }
+    *vptr = 0;
+
+    *vec = (char **) buffer;
+    free(cmdline);
+    return elements;
+}
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _RB_W32_CMDVECTOR_H */
+