Fixed reading from file when using standard separator (" ")

cbeust · Apr 8, 2015 · 3f3a49c · 3f3a49c
1 parent cea0c16
commit 3f3a49c
Showing 1 changed file with 24 additions and 5 deletions.
diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java
@@ -38,6 +38,8 @@
 import java.util.Map;
 import java.util.ResourceBundle;
 
+import bsh.classpath.BshClassPath.GeneratedClassSource;
+
 import com.beust.jcommander.FuzzyMap.IKey;
 import com.beust.jcommander.converters.IParameterSplitter;
 import com.beust.jcommander.converters.NoConverter;
@@ -351,11 +353,28 @@ private String[] expandArgs(String[] originalArgv) {
     // Expand @
     //
     for (String arg : originalArgv) {
-
       if (arg.startsWith("@")) {
         String fileName = arg.substring(1);
-        vResult1.addAll(readFile(fileName));
-      }
+        List<String> fileArgs = readFile(fileName);
+        List<String> splitFileArgs = Lists.newArrayList();
+        //special treatment for standard separator (" ")
+        String[] v1 = fileArgs.toArray(new String[0]);
+		for (int i = 0; i < fileArgs.size(); i++) {
+			String arg2 = fileArgs.get(i);
+			if (isOption(v1, arg2)) {
+				String sep = getSeparatorFor(v1, arg2);
+				if (" ".equals(sep)) {
+					String[] sp = arg2.split("[" + sep + "]", 2);
+					for (String ssp : sp) {
+						splitFileArgs.add(ssp);
+					}
+				}else{
+					splitFileArgs.add(arg2);
+				}
+			}
+		}
+		vResult1.addAll(splitFileArgs);
+	}
       else {
         List<String> expanded = expandDynamicArg(arg);
         vResult1.addAll(expanded);
@@ -481,9 +500,9 @@ private static List<String> readFile(String fileName) {
 
     try {
       BufferedReader bufRead = new BufferedReader(new FileReader(fileName));
-
+      
       String line;
-
+      
       // Read through file one line at time. Print line # and line
       while ((line = bufRead.readLine()) != null) {
         // Allow empty lines and # comments in these at files