1
1
/*
2
- * Copyright (c) 1998, 2020 , Oracle and/or its affiliates. All rights reserved.
2
+ * Copyright (c) 1998, 2025 , Oracle and/or its affiliates. All rights reserved.
3
3
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4
4
*
5
5
* This code is free software; you can redistribute it and/or modify it
41
41
/* We should also include jdk_util.h here, for the prototype of JDK_Canonicalize.
42
42
This isn't possible though because canonicalize_md.c is as well used in
43
43
different contexts within Oracle.
44
- */
44
+ */
45
45
#include "io_util_md.h"
46
46
47
47
/* Copy bytes to dst, not going past dend; return dst + number of bytes copied,
@@ -139,7 +139,8 @@ lastErrorReportable()
139
139
|| (errval == ERROR_ACCESS_DENIED )
140
140
|| (errval == ERROR_NETWORK_UNREACHABLE )
141
141
|| (errval == ERROR_NETWORK_ACCESS_DENIED )
142
- || (errval == ERROR_NO_MORE_FILES )) {
142
+ || (errval == ERROR_NO_MORE_FILES )
143
+ || (errval == ERROR_NETNAME_DELETED )) {
143
144
return 0 ;
144
145
}
145
146
return 1 ;
@@ -183,7 +184,7 @@ wcanonicalize(WCHAR *orig_path, WCHAR *result, int size)
183
184
/* Copy prefix, assuming path is absolute */
184
185
c = src [0 ];
185
186
if (((c <= L'z' && c >= L'a' ) || (c <= L'Z' && c >= L'A' ))
186
- && (src [1 ] == L':' ) && (src [2 ] == L'\\' )) {
187
+ && (src [1 ] == L':' ) && (src [2 ] == L'\\' )) {
187
188
/* Drive specifier */
188
189
* src = towupper (* src ); /* Canonicalize drive letter */
189
190
if (!(dst = wcp (dst , dend , L'\0' , src , src + 2 ))) {
@@ -244,9 +245,9 @@ wcanonicalize(WCHAR *orig_path, WCHAR *result, int size)
244
245
continue ;
245
246
} else {
246
247
if (!lastErrorReportable ()) {
247
- if (!(dst = wcp (dst , dend , L'\0' , src , src + wcslen (src )))){
248
- goto err ;
249
- }
248
+ if (!(dst = wcp (dst , dend , L'\0' , src , src + wcslen (src )))){
249
+ goto err ;
250
+ }
250
251
break ;
251
252
} else {
252
253
goto err ;
@@ -255,7 +256,7 @@ wcanonicalize(WCHAR *orig_path, WCHAR *result, int size)
255
256
}
256
257
257
258
if (dst >= dend ) {
258
- errno = ENAMETOOLONG ;
259
+ errno = ENAMETOOLONG ;
259
260
goto err ;
260
261
}
261
262
* dst = L'\0' ;
@@ -366,7 +367,7 @@ JDK_Canonicalize(const char *orig, char *out, int len) {
366
367
// Change return value to success.
367
368
ret = 0 ;
368
369
369
- finish :
370
+ finish :
370
371
free (wresult );
371
372
free (wpath );
372
373
0 commit comments