From 622de01c7f685ec445cef36e57fafa6bfa3d61c0 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 31 Jan 2007 17:06:33 +0000
Subject: [PATCH] 	* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121424 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/ChangeLog                   |   9 ++++++
 .../classpath/tools/jar/messages.properties   |   1 +
 .../gnu/classpath/tools/jar/Main$1.class      | Bin 964 -> 964 bytes
 .../gnu/classpath/tools/jar/Main$2.class      | Bin 903 -> 903 bytes
 .../gnu/classpath/tools/jar/Main$3.class      | Bin 899 -> 899 bytes
 .../gnu/classpath/tools/jar/Main$4.class      | Bin 904 -> 904 bytes
 .../gnu/classpath/tools/jar/Main$5.class      | Bin 1014 -> 1014 bytes
 .../gnu/classpath/tools/jar/Main$6.class      | Bin 966 -> 966 bytes
 .../gnu/classpath/tools/jar/Main$7.class      | Bin 0 -> 910 bytes
 .../classpath/tools/jar/Main$HandleFile.class | Bin 1151 -> 1151 bytes
 .../classpath/tools/jar/Main$JarParser.class  | Bin 1469 -> 1469 bytes
 .../classpath/tools/jar/Main$ModeOption.class | Bin 1413 -> 1413 bytes
 .../gnu/classpath/tools/jar/Main.class        | Bin 4933 -> 5565 bytes
 .../tools/gnu/classpath/tools/jar/Main.java   |  29 +++++++++++++++++-
 14 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index d1295d2b9d79..bcba0a9385d7 100644
--- 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 e589a210ffc1..a456fe2438d7 100644
--- 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
GIT binary patch
delta 23
fc-lL{euRC47&GI($>PiztcMsl7!FTvVRirjS?C8K

delta 23
fc-lL{euRC47&GIZ$>PiztOpo47!FQuVRirjS*`~f

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
GIT binary patch
delta 23
fc-m`cZ)e}|n2GV|<R?sVtS1>b7*0)gXLbMpXUGT)

delta 23
fc-m`cZ)e}|n2GW5<R?sVtj8HR7*0%fXLbMpXO0L4

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
GIT binary patch
delta 23
fc-m`bZ)V?cpNa9z<OfV~tQQzK7%onBW_ADoXIlsj

delta 23
fc-m`bZ)V?cpNa9*<OfV~tmhaw7|u_2W_ADoXCVj&

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
GIT binary patch
delta 23
fc-re=?_l5Xgo*L;<flw=tk)Sh7;a4VV0HiiX{-o4

delta 23
fc-re=?_l5Xgo*Lu<flw=tXCO07_LqBV0HiiX>tfP

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
GIT binary patch
delta 23
fc-s5M{*8TuBQxWz$xh7qtoIoB8SYQs#_Rw9YxM|j

delta 23
fc-s5M{*8TuBQxWT$xh7qtaljr8SYNr#_Rw9Yr6<&

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
GIT binary patch
delta 23
fc-lM0evEyC1T*8)$&$<&tgje27+z0qV|D-lUi}B5

delta 23
fc-lM0evEyC1T*8~$&$<&tS=Zi7+y|pV|D-lUc(2Q

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
index 0000000000000000000000000000000000000000..cb9fcd55e84d77a6e8ee073750e9fe738db44b51
GIT binary patch
literal 910
zc-n<hU279T6g|_f-EO*?G}`!;)>PBFiRiW<_z)2!v><Gw5b1+&(_~1dY-YmjMAUyJ
zSOg#Z0sa>s^aqG{rczLAeAwMPXU@I%oO}1nk58Wg?4liFfnj5$X6Yd3MKR@eoLa5(
zB0c6NJ>XI`AB6}QHqYaXgw<1<KA&2t6~mGp%c8kM1+#e-JH&h}m9$S79wzgt-RzjZ
z=4sB=DD7J#)u_`tWC*%?C?YVd#JGT^5*BeWMu<xcwd5Z;<xDEkn@x^{dC8A*!BEZg
zfaizYNO%4P2F?USBbz@IGO^O+N~^aMJuApF>;8u9y7GVNAm>wV3Nd6@OU{>B+Iuq)
zexOB&n+)y$4*o15!a8n+*kGv76Cb02O_FB>ANKe}6#GU``gSO3h3pl>GB=~yL?}yQ
z`g&#tVqdz+L@xP(6U`7mQ%abw>mX=a<vlgXbwM5ugdOW)j07!)ircc}xqK&HINOF{
zD`{nO9G%iS*rDAn(l5#?6}MoD7U&7FOn5|5k8T6{#_fA2D7EYNKO%nbS!H^cJeyJG
zS5zo!_*yYmQ3ZT-8CN_f#u{pL%WxIf2)RyJK&KnN%Tq!eD{6m0DL6s>&lcZE(0AXW
fc1k>J5#csr&cq#`)5Mm~q7nQ1Dz<&Ab=>_4`KjBj

literal 0
Hc-jL100001

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
GIT binary patch
delta 47
zc-s5V@t<SEG-k%+$<vt|WiuJL7_u2;8FCopfV2`rE`u&Z0fQ|=A%iDF(PUE=F913^
B3nBmj

delta 47
zc-s5V@t<SEG-k%c$<vt|Wz!kB7%~}T8L}AUfV2`rHiIrh9)m4IK7%Ji!DLewF90~a
B3lIPR

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
GIT binary patch
delta 75
zc-jF=0JQ(T3%v`lXaohA00jV-lWhd=HJktn0G$9A0G<FL0G|LZ0H6Ru0HFX+0HOd}
h0HpwE0Hy$S0H*+d0H^?r0I2|$0IC3^0IZXd1uPEu6w&|y

delta 75
zc-jF=0JQ(T3%v`lXaoh800jV*lWhd=HJShl0Gj|80Gt3J0G$9X0G<Fs0G|L)0H6R{
h0HXkC0HgqQ0Hpwb0Hy$p0H*+!0H^??0IHLb1uP1X6tVyS

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
GIT binary patch
delta 61
zc-m{_Zsp#f&ca#Gz{*g|z|BxM*?=XJvkk~=Vc=zGoxF%;hG-W97ehCLI71JE5<?$@
P8bd#W9>avm{;XyIp&SiS

delta 61
zc-m{_Zsp#f&ca#Cz{*g~z|BxI*?=XJvjxa&V&G+Hp1g=<hG+)^7egn5I71hM5<?Gz
P8bdFG9z)+`e^xU9o^TC0

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
GIT binary patch
delta 1740
zc-n1MS#VQj7(J(HbCa7}lBP{d=>mmPvX!!_m5wt&r3kht?F^lOGK4miFd?mJ>d1o=
z#~0s}nd^%$D!wq|fYJgtg$xBzs3NYoATG#Kcice04g79eY=>d)%>DoWe%txZcmCvP
z&B1`{`1J!r0OoRzf*hh;@3)lq2iMxI3U(2da;&Jh%Z678wIv*l&u&Y0M&l}WVjIC8
zVupU!QLeviU)W?%M8cgb!&@S~3erUJ=J2E8x@dRZlD>@_BZ)|7tC%AR1^bE8o3`cg
zp1x#TQX;pEn(g`{swcIzHyPQYVF-taoM@czG~XtoLB$|m(@=yX#ANSnU3{xm7<j{U
zI!Y9dJB^kTyMke&qAT84*AWZ%_V$F6oAe=zBegW1Ol(zg3~!mi$BBaR;HGFSl1*KO
z6B;(+9YHu|jfLY~bq{RV9O+0l_|}-k-_!6uJ|Ju+Kh4p2geda*CU^_fXuPXI!AU`Q
zvxL4@b<_~Kv1~xjhJ>`(e0xguv-asct>>yU`GxLRXM|M{UukH<G8JFroPx82>(+W2
z&f@}M?bsAfEKW)#?{Z(Gf^UeDTV0p*MPpLOO!l3I@9~2^tXAibV3CRuT-5M0e$lU~
z4aFn)O~dcmUX$IUp$abR>m5Pu60VpuUL~r$q8N|9%i*;Cso^jDtsil;&Nm_dt6?8J
zcG=y~kO!+u(xOmQ=^RJYXbwqZF7xzzw3<9BqavNGKcOjhT4~qtDX!|<w6+2knEO+9
zWLT)Nh#p<dpW4L|!kv}!@^~_mh=*fK6N&DG%2JjooHAhq4@v`LI?`B<0HO4lpJH*9
zm7Jz<>P_b?vZar8M0%3Z?zqM(PS>~P*V!_x);N<j`f&a!TJ;wvtthQWF7AbjWpHAJ
zFw%ljw4oaHy2Y6&T>}LVLBqo+k+lr##Ihc95Z0e|&bMEH4Hkea_Z)XFU@Dlw&XC`=
z$o<M7=BKgSKxZIm;PJq2xzIVNk@q^u1N6gz0jafD^tumsiYD(zTJjE}4+roJGI$mT
zv0d)lejLRKdCuUZ4DvKpoTF1@QjQV&L>qHuU4V;RhRaMf;|gX;`e~z};Dt|44mL``
z0hwYIYq3X)=Ex(1l`q9&e+gF89}6=uLKzH(25=ya!)d(UvIA56dr_UiF)=I-1=46t
z<4pr^w@X{^hMI?OoZo@m_I}9(+>t^(J{;?_Qg{Pypa9q57ORIuP}X`{a5t4KOusNM
zWyfH8gqe>}D5>TNpwXRMa(#?XvVcW6@(zlp$@ypaTxyx{4~a6(JnjBe8eg^qhMvc)
zfMuS=z!_KV3n&X%G8hTDY6tOc8b6A~z)uE#Z3_l6xD@iI@rQwH(q-9mP~`NFY_A){
zVOm$#`VHFp|DRnA>_V&D1WrP+Okp-%XkY=B(2XV*BDIP|SWVA_=Gw=alO0t$q@_Hx
zW~Y&ZRj^WHzBFT(gr~-)@swE1Y4|c=C{1T`z@MgT2g+Io=q_ZjD9hmFpd1WV<PLI%
zNxlvFa4}Umk$jfICNgoc5(S)w3Ra<-)8S?HxJKa1qB1G1;w(WbKdLC9SEMDB({HxU
m08P?c<%(PaMM1z?S!avKeX`cc`ee34w_Z``waFh*_V6FFDV0(H

delta 1039
zc-l>pTWnNS6o$Vwm!3H@XQopM(+o70T4*~xQ`-VIF@5n8KoB(2#8_IzrXg5^EvW;M
z2Qv>QzWT6z@JZs6FQ~o1=|G{3B3>$3E28y+R6s=$FCZYGl{JHcImzDZWUsZ?_y23}
zcMsLZCuaAK11;iM_=HL`<gXk`ciJXzKW6&}w)P2$`c8AeO2~*g7FjI2&9z94YcVR6
zKh?dhyQ#OoY1Ko^pY7SWCDYsA7e?6Qu!5Cg#@KJM&on#plH(i@N_w8`9=InX1nO6%
z?z4DHs4!DbMYxc9(BT~pnXI!Yn&<8?dER&UfC)3`w3X*M>~MsSgixlxJu}eTx5;!x
zlJc>UXgV^<Ck}HtDpZ@QV3m`4B+NRFIef<FrYE{?j;&B%I0PvP^A*P}zBW_Q@&Mm(
z!kmfL`uNtwW4GJPaLQqjqoys^UdP!&JY;i@UoCzS;zhZeyZbgZwQqkWv+-$%-}v3^
zh*kNxVDhnq#YHY#Tr$UF6)pUUD_C2UHM3c5xyoM_*ZwoDc*{-G9R6n3EG}&dof8}p
z@tLmDX$hJ;<ExXc1h|(l%PHl4mH7Zk9%d1(=H>W6@=+|-<IqWk?hEMBlgDXhgQ+Q7
zY9AqlAEa$$L)kLPx@nK++(DhUk6K;VlhE}|A}Vw)!&EauE4#GCZl1tnD>+_d4=?F_
zUS*#~2RY0HCz#?q(-LMzN;xT&oRSo$rA7B;oRz!OvpT(b;f?0hlhVIPR+`z#>pF~T
zna>;A*r%U*tZP~m3arE0-Ya75)OiJTU(+y3Zmm213U#i3iQi*yym1E$T>lvPj(B5^
zw?}zbPdwi9_^>_gjxpJxHB%m+Htb^B<I6lV4>mS<Sxye!)P9>92N$%-MQwM9JGe}n
z4s8WjRR7f?f5Q!cfB6g1X}(kZAS;VPe41Ut_xzyXHfL0b6wzPM6ID+A7}7Dyk851z
z`RTPR^VbgZ^PKZJmU{e=*4X1pAjdz2!Vpp7+W7x?vxGz+p7<$~AeB-=jabx)eal{j
wD?k<8Tc~*{y{U|Z1T<gW)e03XmV|Uqu2#xPM9a|!BRW5yJ}Hrid4ArK>p8ymFaQ7m

diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java
index 34f637204e77..c3575bdefd56 100644
--- 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);
   }
-- 
2.47.3