From 2dac20493cf190fb56f04d1fe22f58c30eac1869 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Fri, 6 Jul 2007 19:06:29 +0000 Subject: Fixed NARPLUGIN-106 --- .../cpptasks/borland/BorlandLibrarian.java | 20 -------------------- .../cpptasks/borland/BorlandProcessor.java | 6 ------ 2 files changed, 26 deletions(-) (limited to 'src/net/sf/antcontrib/cpptasks/borland') diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java b/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java index 1b13e54..6ec9212 100644 --- a/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java +++ b/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java @@ -61,17 +61,11 @@ public class BorlandLibrarian extends CommandLineLinker { } protected String getCommandFileSwitch(String cmdFile) { - // - // tlib requires quotes around paths containing - - // ilink32 doesn't like them - StringBuffer buf = new StringBuffer("@"); - BorlandProcessor.quoteFile(buf, cmdFile); - return buf.toString(); } public File[] getLibraryPath() { @@ -189,9 +183,7 @@ public class BorlandLibrarian extends CommandLineLinker { throws IOException { String[] cmdargs = BorlandProcessor.prepareResponseFile(outputFile, args, " & \n"); cmdargs[cmdargs.length - 1] = getCommandFileSwitch(cmdargs[cmdargs.length -1]); - return cmdargs; - } /** @@ -212,28 +204,16 @@ public class BorlandLibrarian extends CommandLineLinker { super.link(task, outputFile, sourceFiles, config); } - /** - * Encloses problematic file names within quotes. - * @param buf string buffer - * @param filename source file name - * @returns filename potentially enclosed in quotes. - */ - protected String quoteFilename(StringBuffer buf,String filename) { - buf.setLength(0); - BorlandProcessor.quoteFile(buf, filename); - return buf.toString(); - } - } diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java b/src/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java index 3dfef2d..6143bda 100644 --- a/src/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java +++ b/src/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java @@ -23,7 +23,6 @@ import java.io.Reader; import java.util.Vector; import java.io.FileWriter; - import net.sf.antcontrib.cpptasks.CUtil; import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum; /** @@ -158,11 +157,8 @@ public final class BorlandProcessor { } public static void quoteFile(StringBuffer buf, String outPath) { if (outPath.charAt(0) != '\"' - && (outPath.indexOf(' ') >= 0 - || outPath.indexOf('-') >= 0 - || outPath.indexOf('/') >= 0)) { buf.append('\"'); buf.append(outPath); @@ -212,9 +208,7 @@ public final class BorlandProcessor { writer.close(); String[] execArgs = new String[2]; execArgs[0] = args[0]; - // - // left for the caller to decorate execArgs[1] = commandFile.toString(); return execArgs; -- cgit v1.2.3