From 191da376a5359a11eb959be5d3cbdd2060c85948 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Sat, 17 Mar 2007 05:00:07 +0000
Subject: [PATCH] Main.java (run): Use class' name in File case.

	* tools/gnu/classpath/tools/javah/Main.java (run): Use class'
	name in File case.

From-SVN: r123012
---
 libjava/classpath/ChangeLog                   |   5 +++++
 .../gnu/classpath/tools/javah/Main.class      | Bin 10929 -> 10939 bytes
 .../tools/gnu/classpath/tools/javah/Main.java |   4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 0f68f919452..120747cca6e 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-16  Tom Tromey  <tromey@redhat.com>
+
+	* tools/gnu/classpath/tools/javah/Main.java (run): Use class'
+	name in File case.
+
 2007-03-16  Tom Tromey  <tromey@redhat.com>
 
 	* tools/gnu/classpath/tools/javah/JniStubPrinter.java
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
index 66c37937fa3ae25fd3a04a59120a0b18f24cb7dc..56c7f488a24fb8b749a30b936a64299e3df668f0 100644
GIT binary patch
delta 803
zcmX|9Sx8i282yf;>D;;I=;(|$71wDtbt+$Mq$G?=NWsixDv+TDGu+4}XhC0kkshj_
z65GHa>q#u_US-_I%5rJnG%c4lTkSC-sQ<RT{G4y$eCPYmccsWz)Um}FqeTgNMf6b!
zD6rB~;T5O=10n|DXFHANxa**>9s9hV-DQ=f3A@TYH8lwW0XIeTV3?gZ=HND)H};B;
zMLfY%kfzjI%Vwk`Hg3|gX;VI)Ge>liev&o`e9{Y%qVN)w%w|IqMcXz3lb97Thk4c%
zy(<1S-Uj0h$gtN_?{St@Iddzk>uL*Y`TPnI@7PpyLCR;9;tMF;y7^z%hO%;R7ANDn
zzKVE;iO%iP5kXr>OK2$(#yS_0qY!aX3h6-s$R$XEpITdJJqt6Nv+R;ENUaJKm(EA6
zZb{b#pMqGIc!_e=Qh`2Q@08K+3bl8^*+Pj|vC>BwZUcsx*PIf6!=;n7k|^n9sw`GV
zRD(|cEVlFH5(T%|Wpk6a7)P-O$5D?HI1Gj}IE6Meqa7{iMgxX$7Na;v79tv@NL4dg
z$;Km&FoH$`1!0)?j8OpTxH;oIry(0I;11t0kg{-$H7~a`q@WgceD4m#poSC*rZLJy
zJ)PwK3gqVs_H$&QZj#ABTEtTe?&2N^D5h{6#39b!&Z9rbOBx)YYb2tLBL1R!&Uc?e
zD3t&913cu)Ok8FT*A+m-)>yQ7#5P*eb^M}uEkLz{HCkeqO}ZTlrt*9!aoZJ4=clFx
z%9wG;c*SJP>d*ze=j~eV?FW2hKP(ygPkHuK1&jIiE=o${rm$?QN%F~*X}~xB%CuI&
z_ksV_D(luLl_Y?|C>xP{6Af3W9_fU21^SuRmTz2i1*!cGDM&TzH<Y>D3R@xinBNws
P;RI~XR)P_>&R+cs+g{#5

delta 759
zcmXX^TS${}9Q~cm&F$N_ww!MJB=Nd-@s>$cE9k+OB$Sp}EFl>+Bv6xPN*Az~dXOOM
z-)&_Ng3z0p+V>^1nq92a?v~w5GcC*PLeXpezv|`BIfujH{5bzu<;BXb4R%4G0QyB-
z!BtjgccsNama1Lh(DohmH5uD#Ly<^^K)`hoeYn9c*h_GW{jm3ok3>Ai6Ogth+{h-R
zEH>^i>JsWhbzwH`SdZsynKR2eMr#FB<CRD$cn!*Cljcm(yGg(p-iVmMBs=b0s-MDi
zBHpnPrxP=5#u?Dhss7JwwdAyZ5%Cnyj6CF<h*2{1Y>^HM#!}ML0wN6b%x0$`>8xbv
zLjdF#Bw>KsqvU56m#at;;?(XJeUhj^@te+5sj3951=d0tF~8Z@i^3>ncB3dp#X%dc
zv7N4*^Z~y~GD@OklBs^P8r%Rn^E>3@qF%vG*6nHySKu(V;wWly3=uGnPNEH`(19pA
z(SpmI#c__@L^MRnYE$x%mottqhyw)Dp&z$#hcsk@jJsUZk{72j#4k&rRXD`j7rR?h
z(TLsr+Ab_agcM4oVOoJEIza{qq@W4S9NDOoWU`SF>2w6c7$E^wq{Tk$=jk1s{X-R;
z?WId3qK%UNqgtMKj|^nyE8oWh-ps*kmhfI0B7rQvUdqXp@sI`F1tz`#H)zyNSgU(c
z>R2#W!HcpOs)IfSFU#}t6J(5Y`&$-wuQb2M2W~g=HD~dW={?1sPi4M51@q-RH7mat
zUuArck}HOv!G9b4QfRrVvyjKZ-#wm<DQbv@EVKs6{2VQ>ss6+%&l1F#&0B7t_v_TO
fTuG-c_7|#ko4pknWy9VyEe~LG-f9f8b-so_{rS*V

diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
index 250844d1d88..dfa04c4c9ef 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
@@ -392,8 +392,8 @@ public class Main
             // Load class from file.
             if (verbose)
               System.err.println("[reading file " + item + "]");
-	    filename = (File) item;
-            klass = getClass(filename);
+            klass = getClass((File) item);
+	    filename = new File(klass.name);
           }
         else
           {
-- 
2.30.2