* 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 d1295d2..bcba0a9 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 e589a21..a456fe2 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 1912cbd..dad181c 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 9bd0cbe..93ef661 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 ddbd7f5..cf00699 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 9dfd4c5..496c411 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 8050a01..2efdda0 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 1266394..4825fd1 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 16d4ed7..6d7c301 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 5a62fdc..db164f2 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 3630f9b..394b4e0 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 1c32274..5b4d96c 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 34f6372..c3575bd 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);
   }