Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 89301 invoked from network); 10 Oct 2005 13:46:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Oct 2005 13:46:11 -0000 Received: (qmail 44391 invoked by uid 500); 10 Oct 2005 13:46:11 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 44334 invoked by uid 500); 10 Oct 2005 13:46:11 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 44323 invoked by uid 99); 10 Oct 2005 13:46:11 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 10 Oct 2005 06:46:10 -0700 Received: (qmail 89163 invoked by uid 65534); 10 Oct 2005 13:45:50 -0000 Message-ID: <20051010134550.89162.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r312650 - /incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c Date: Mon, 10 Oct 2005 13:45:50 -0000 To: harmony-commits@incubator.apache.org From: geirm@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: geirm Date: Mon Oct 10 06:45:47 2005 New Revision: 312650 URL: http://svn.apache.org/viewcvs?rev=312650&view=rev Log: Double '\' for windows paths... Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c?rev=312650&r1=312649&r2=312650&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c Mon Oct 10 06:45:47 2005 @@ -505,6 +505,8 @@ * with suffix. Make @e sure all files are writeable * for final rm -rf. */ + + sprintfLocal(jarscript, JVMCFG_JARFILE_DATA_EXTRACT_SCRIPT, tmparea_get(), @@ -514,7 +516,34 @@ classpath_list[i], class_location); - int rc = system(jarscript); +#ifdef CONFIG_WINDOWS + + /* + * gmj : awful hack - need to escape out every \ in paths + * or it doesn't seem to get across into the batch file correctly + */ + rchar *fixscript = HEAP_GET_DATA(JVMCFG_SCRIPT_MAX, rfalse); + + char *buffptr = fixscript; + char *jarscriptPtr = jarscript; + + char c; + while((c = *jarscriptPtr++)) { + *buffptr++ = c; + + if (c == '\\') + { + *buffptr++ = '\\'; + } + } + *buffptr = '\0'; + + strcpy(jarscript, fixscript); + HEAP_FREE_DATA(fixscript); + +#endif + + int rc = system(jarscript); if (0 != rc) {