infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 21:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

7021987: native2ascii "file cannot be read" error message is broken

Browse Source 
Reviewed-by: lancea, mchung
This commit is contained in:
Alan Bateman 2011-03-02 16:56:07 +00:00
parent 90194bc501
commit 45fd401ff7
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jdk/src/share/classes/sun/tools/native2ascii/Main.java
View File

@ -94,7 +94,7 @@ public class Main {
* Run the converter
*/
public synchronized boolean convert(String argv[]){
Vector v = new Vector(2);
List<String> v = new ArrayList<>(2);
File outputFile = null;
boolean createOutputFile = false;
@ -115,7 +115,7 @@ public class Main {
usage();
return false;
}
v.addElement(argv[i]);
v.add(argv[i]);
}
}
if (encodingString == null)
@ -126,11 +126,11 @@ public class Main {
initializeConverter();
if (v.size() == 1)
inputFileName = (String)v.elementAt(0);
inputFileName = v.get(0);
if (v.size() == 2) {
inputFileName = (String)v.elementAt(0);
outputFileName = (String)v.elementAt(1);
inputFileName = v.get(0);
outputFileName = v.get(1);
createOutputFile = true;
}
@ -363,9 +363,7 @@ public class Main {
private String formatMsg(String key, String arg) {
String msg = getMsg(key);
String[] args = new String[1];
args[0] = arg;
return MessageFormat.format(msg, (Object)args);
return MessageFormat.format(msg, arg);
}

11
jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh
View File

@ -24,7 +24,7 @@
#
# @test
# @bug 4630463 4630971 4636448 4701617 4721296 4710890 6247817
# @bug 4630463 4630971 4636448 4701617 4721296 4710890 6247817 7021987
# @summary Tests miscellaneous native2ascii bugfixes and regressions
@ -100,6 +100,15 @@ rm -f x.*
$N2A -reverse -encoding MS932 $TESTSRC/A2N_4701617 x.out
check 4701617 $TESTSRC/A2N_4701617.expected x.out
# Check that the inputfile appears in the error message when not found
badin="DoesNotExist"
$N2A $badin x.out | grep "$badin" > /dev/null
if [ $? != 0 ]; then
echo "\"$badin\" expected to appear in error message"
exit 1
fi
# for win32 only ensure when output file pre-exists that
# native2ascii tool will simply overwrite with the expected
# output file (fixed bugID 4710890)