* resource/gnu/classpath/tools/jar/messages.properties

	(Main.Stdin): New message.
	* tools/gnu/classpath/tools/jar/Main.java (initializeParser): Add
	'-@' option.
	(readNames): New method.
	(run): Use it.

From-SVN: r121424

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index d1295d2b9d79e568e3f8ffb6d4faa3932eb59827..bcba0a9385d78377cdd90d67b4d77ec18347b109 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-31  Tom Tromey  <tromey@redhat.com>
+
+       * resource/gnu/classpath/tools/jar/messages.properties
+       (Main.Stdin): New message.
+       * tools/gnu/classpath/tools/jar/Main.java (initializeParser): Add
+       '-@' option.
+       (readNames): New method.
+       (run): Use it.
+
 2007-01-26  Andrew Haley  <aph@redhat.com>
 
         * java/lang/SecurityManager.java: Load and initialize

diff --git a/libjava/classpath/resource/gnu/classpath/tools/jar/messages.properties b/libjava/classpath/resource/gnu/classpath/tools/jar/messages.properties
index e589a210ffc18359082dc08e9a86a8303e880f69..a456fe2438d7d78d2616b2ff04d2974e08d3ae6d 100644 (file)
--- a/libjava/classpath/resource/gnu/classpath/tools/jar/messages.properties
+++ b/libjava/classpath/resource/gnu/classpath/tools/jar/messages.properties
@@ -69,3 +69,4 @@ Main.FileNameGroup=File name selection
 Main.ChangeDir=change to directory before the next file
 Main.ChangeDirArg=DIR FILE
 Main.InternalError=jar: internal error:
+Main.Stdin=Read file names from stdin

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class
index 1912cbdbdfd40b83a3b6985c8db4e6f16d7dc85a..dad181cde8fbffef8f6bbdc65d27dcd5cd8445c1 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class
index 9bd0cbee854252c3c211365d8434b23f4f8c9f41..93ef661618aa91b397d3c33d853fe5cfb220a584 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class
index ddbd7f53730c1ca1b8040b412498f97dc238ff5c..cf00699159fcb6ea2b2a54eed8f869337001189e 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class
index 9dfd4c5c90f370790169eb1eea18d8da86f6c6f2..496c41185201f13b4822537f5f7b637c2945aaa3 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class
index 8050a014e649ed9fea3c5bf5a1e82cb07472964a..2efdda0afea1166de26b082ffce76cdbb1f1d9b8 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class
index 126639456ef8fb0a1a18f9dbc070b8206ff8d2e6..4825fd1db1e7d6847964b52d700523a120d23475 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class
new file mode 100644 (file)
index 0000000..cb9fcd5
Binary files /dev/null and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$HandleFile.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$HandleFile.class
index 16d4ed738593e836de5b068d657f1214799b6560..6d7c301d9e802572aa7252d3eb9974f1167cf0ac 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$HandleFile.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$HandleFile.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$JarParser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$JarParser.class
index 5a62fdc204df6b697e82d15830e2499bc64bdff4..db164f2023e00657c6930d61bbea3af07daa932f 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$JarParser.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$JarParser.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$ModeOption.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$ModeOption.class
index 3630f9b3c214190028de66741938388b2264f520..394b4e02e3ffec555c0c1bedb0d45e081aba0286 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$ModeOption.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$ModeOption.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class
index 1c32274ee10fda7567c075e05473fef0892d0630..5b4d96cd3fc0c03740b1a8e61ba11a298ba03017 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class differ

diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java
index 34f637204e77e9fe9c92f491380ac2ea19a2c11d..c3575bdefd56628733346bcfb793a008431e3047 100644 (file)
--- a/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java
@@ -1,5 +1,5 @@
 /* Main.java - jar program main()
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -45,7 +45,9 @@ import gnu.classpath.tools.getopt.OptionException;
 import gnu.classpath.tools.getopt.OptionGroup;
 import gnu.classpath.tools.getopt.Parser;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.InputStreamReader;
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -232,11 +234,34 @@ public class Main
         changedDirectory = argument;
       }
     });
+    grp.add(new Option('@', Messages.getString("Main.Stdin"))
+    {
+      public void parsed(String argument) throws OptionException
+      {
+       readNamesFromStdin = true;
+      }
+    });
     p.add(grp);
 
     return p;
   }
 
+  private void readNames()
+  {
+    String line;
+    try
+      {
+       BufferedReader br
+         = new BufferedReader(new InputStreamReader(System.in));
+       while ((line = br.readLine()) != null)
+         entries.add(new Entry(new File(line)));
+      }
+    catch (IOException _)
+      {
+       // Ignore.
+      }
+  }
+
   private void run(String[] args)
       throws InstantiationException, IllegalAccessException, IOException
   {
@@ -245,6 +270,8 @@ public class Main
     if (args.length > 0 && args[0].charAt(0) != '-')
       args[0] = '-' + args[0];
     p.parse(args, new HandleFile());
+    if (readNamesFromStdin)
+      readNames();
     Action t = (Action) operationMode.newInstance();
     t.run(this);
   }