From 8de15ffc9d9c4526bccc9f594edc8d8fdc57f83a Mon Sep 17 00:00:00 2001 From: Tom Tromey 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. From-SVN: r121424 --- 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 d1295d2b9d7..bcba0a9385d 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,12 @@ +2007-01-31 Tom Tromey + + * 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 * 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 e589a210ffc..a456fe2438d 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 fcmX@YeuRC47&GI($>PiztcMsl7!FTvVRirjS?C8K delta 23 fcmX@YeuRC47&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 fcmZo?Z)e}|n2GV|b7*0)gXLbMpXUGT) delta 23 fcmZo?Z)e}|n2GW5Z)V?cpNa9zZ)V?cpNa9*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 fcmeyy{*8TuBQxWz$xh7qtoIoB8SYQs#_Rw9YxM|j delta 23 fcmeyy{*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 fcmX@cevEyC1T*8)$&$<&tgje27+z0qV|D-lUi}B5 delta 23 fcmX@cevEyC1T*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 zcmaJs^aqG{wjWR%`>;E6?>+b9oI5}MeESYy3r!yd!s<{@<9;HtY$EI^w#Fn` zd??a*Pbgj6_TdrMW?_cXnu(2HPpmSUFmFdHt8H?@&Mfq4#TFxu}|>YW*`F)79(82e26(*jo{-Np`uoAGJPu!5=mI@ zn7&B%MXH>A;`AH|LiN(QYTHa=u_m<9AID~zF=uL@^K7~D7iMSX6Om?eKv=0?3_EJ! z&WFCt159VbHcN^6<6-J6lDR&hu76O-|J_M{z|L4-OQgp%8` z5{ddG-#FSSVZGj%sq6`(V^|BDyxTc`qEsrm1@o=IpN|Fh2Yl;t)Z;U1K0ZR&tUURO z=yQ%L@;}Vc#F;-)V!N8xim-%bwm1vdaU;h>SV5Vigqyg_|N10tM8t&S%IT;uAc`2LCavm{;XyIp&SiS delta 61 zcmZqWZsp#f&ca#Cz{*g~z|BxI*?=XJvjxa&V&G+Hp1g=mmPvX!!_m5wt&r3kht?F^lOGK4lQVM1Ed)R6}# zjxW9`GuIbiRD5B^0i^|!LWY7UR1sHP5Eo>rJ8mH027WgQ79Hl!7hUE4njU@qq<$RjHCAyeg$f34N5U?)*6$EvD3EO?nv+k)Zf?2dSMII3a?wi4_o zX6R>ZmHLa;g)P=tDA>I+xH&YSAVrjJ3O*cc2=_HC8SLo^#X{ZfVh+U=>?6u=*p^58 z2jd-aiQJquTlI%jS7OURJhWNEC=L>N;V9v1y+uTmiV?h`p#+DC$?jXacvh=O;x)tR z2vI!Ylr7ifS*>7&Ke0udmHZCuqo6PZ}O}$ioc`bUA#wFgk^VYI2s~K+@37jjJNO)M|+zT zoDhUJcV3~?9aaO?@ z!jVaQQ#}pmaGo%CZ4Aa1$EA{cxu;pdS47$WU6%}oBQiQ8**6-##drFcT3a}dMJmQ| zLBo&uNx!N#m5$>V4Zmi%#{06Y6kO8R+x*%^TsGQxg{X0hVqE%8o8A1ohClG9e%RJN z-+=tLhP`lEWp`ae0n92%lR{CYeF9OlF(i%oEYR=L>I$f2MLJo3OjE2h)2iWPT+z2` z9YriM_9v}KvshyZUAkI0wU=dtGb82Y(Re5p4Mvv6Vtp}{<*ZOR<)#tbFJsAxQ)4B3 zgwk)kibPdbbDF}bH=HwVUHV8@s6QU=i)yUlbbV`KgC)&cjWb!Nj}@MzS$}@gitg8Gy8`PTEWzyxsR?ql`^ zO!(8-5%4+|IbRyV{1kR2(e3jm@u+W?TqHuU4RQ*hD%Je;xcAQ`e|8E zaKj@f8=IxzuuQRr_1G;%^W>4i%9~QLzW}r0kA-O@18Ix|hOs||Ln*x4wjEQvdr+Ik zQ86qI_)=(2;q@fm>=asW2U^FjpWBZ7&LPPJ+?GHi-p}!@mc9YkQG{!7iq%EJFKZ)B zxRXi-rdK*IWpglH(wPrXEUD%RpzO{mJ^K(JWdMtCWc5pg(eqF6snjyy9~5O8c{;s` z6h3eBjXsN6KGQr?5~m&Y&!NI+N@G0Ws2{=CDSR)MBz{QZ=MKLwjf(+q3cn?BRajO$ z14T}M$@W^3I7IWxdT)}JA<3PcT^+14Yq<%Wgi@KpY&y`yA}pa3Ei6W26-%(1uA9hp z=Ew;=sqQk%v_|xoJEh#f)iq(qJG(d#lfzqGLNM+J@;YW~nGE z$;o~>Bw3X|!Wl;MEhvP8iRv8CO!HX|i^#;mY7}uAs#t?sPKTSd6B>ahgUV=W4QGj3 z*90aO5(~5Y9DYrP$;7aY6WXWv_6mus3_tC1O&8tX6h?9`Mz`Sch31g&UX*G zM{45}v-`(^7I7?mLZunwdDkskgsr&3!AM>e;#@)7#${M%d@Diq&DpIB0ReG&>8D;~Wx7dLHc_xGN(B>er<1 zv3NtMFjG!NxR83-;Vq7stg|GV=gu&B-f?)B2{Y)lmFGF;aGdvrP^P~rahi<2X)>)YIWUALf6-csL=TgQ_Tpi>`{olJc7qgay-vIUeNix z%mIxKbBqa2GsPvQCCrSJaz-jSD=E%Ni|#A9Aa|%|b=rCH960r)^evK=W_I(c4x?HY z@|pts^ihv>O>07d>#)LmMOwRcUIG2OzG0Ny26y}=>RkUazsLS~<1QAt{xR|$@x~l) zj&f8_Jl^(ruRZOKG1;LtQyw2R>|xsDvph2!8ymbVXNI)loc3GPIJm4JR}}6lw{eX& z9oj0ctNt5B{ta^k{^qY#ILFsYKgjB$5T9n3@D1N8ahvlhME@4;`kZ2@?bMGU9ix1= z-c>%|zmjF)hGBk~cPYnmk6+Uodt49X__I(LB1&9=|4(n0km$t|KV=f6Qc9>1i#oCY zvscL#NEO^$ta&NzR7OGqny>C^g$fo+Lb@l{D$7Yk%h3xXIzOLYDUpbIcEPg006D() AFaQ7m diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java index 34f637204e7..c3575bdefd5 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.30.2