stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8340329: (fs) Message of NotLinkException thrown by FIles.readSymbolicLink does not include file name (win)

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Brian Burkhalter 2024-09-19 15:25:04 +00:00
parent 3bb8de3145
commit 2ada313cdd
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -86,7 +86,7 @@ class WindowsLinkSupport {
x.rethrowAsIOException(path);
}
try {
return readLinkImpl(handle);
return readLinkImpl(path, handle);
} finally {
CloseHandle(handle);
}
@ -297,16 +297,18 @@ class WindowsLinkSupport {
* Returns target of a symbolic link given the handle of an open file
* (that should be a link).
*/
private static String readLinkImpl(long handle) throws IOException {
private static String readLinkImpl(WindowsPath path, long handle)
throws IOException
{
int size = MAXIMUM_REPARSE_DATA_BUFFER_SIZE;
try (NativeBuffer buffer = NativeBuffers.getNativeBuffer(size)) {
try {
DeviceIoControlGetReparsePoint(handle, buffer.address(), size);
} catch (WindowsException x) {
// FIXME: exception doesn't have file name
String pathname = path.getPathForExceptionMessage();
if (x.lastError() == ERROR_NOT_A_REPARSE_POINT)
throw new NotLinkException(null, null, x.errorString());
x.rethrowAsIOException((String)null);
throw new NotLinkException(pathname, null, x.errorString());
x.rethrowAsIOException(pathname + ": " + x.errorString());
}
/*
@ -342,8 +344,8 @@ class WindowsLinkSupport {
int tag = (int)unsafe.getLong(buffer.address() + OFFSETOF_REPARSETAG);
if (tag != IO_REPARSE_TAG_SYMLINK) {
// FIXME: exception doesn't have file name
throw new NotLinkException(null, null, "Reparse point is not a symbolic link");
String pathname = path.getPathForExceptionMessage();
throw new NotLinkException(pathname, null, "Reparse point is not a symbolic link");
}
// get offset and length of target

27
test/jdk/java/nio/file/Files/Links.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -22,7 +22,7 @@
*/
/* @test
* @bug 4313887 6838333 6863864
* @bug 4313887 6838333 6863864 8340329
* @summary Unit test for java.nio.file.Files createSymbolicLink,
* readSymbolicLink, and createLink methods
* @library ..
@ -45,7 +45,7 @@ public class Links {
}
/**
* Exercise createSymbolicLink and readLink methods
* Exercise createSymbolicLink and readSymbolicLink methods
*/
static void testSymLinks(Path dir) throws IOException {
final Path link = dir.resolve("link");
@ -131,6 +131,27 @@ public class Links {
Files.deleteIfExists(mydir);
Files.deleteIfExists(link);
}
// Check message of NotLinkException
try {
Files.createDirectory(mydir);
try {
Path mytarget = Files.readSymbolicLink(mydir);
} catch (NotLinkException expected) {
String filename = mydir.getFileName().toString();
String message = expected.getMessage();
boolean okay = message.contains(filename);
if (!okay) {
System.err.println("Message \"" + message + "\"" +
" does not contain the filename \"" +
filename + "\"");
assertTrue(okay);
}
}
} finally {
Files.deleteIfExists(mydir);
}
}
/**