mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5327 from sleuthkit/release-4.13.0

Browse Source 
Merge release-4.13.0 into develop
This commit is contained in:
Richard Cordovano 2019-10-07 17:18:00 -04:00 committed by GitHub
commit 081ae44ff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java
View File

@ -20,8 +20,6 @@ package org.sleuthkit.autopsy.coreutils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.logging.Level; import java.util.logging.Level;
import org.openide.filesystems.FileObject; import org.openide.filesystems.FileObject;
import java.nio.file.Files; import java.nio.file.Files;
@ -172,19 +170,7 @@ public class FileUtil {
//for now escaping /:"*?<>| (not valid in file name, at least on Windows) //for now escaping /:"*?<>| (not valid in file name, at least on Windows)
//with underscores. We are only keeping \ as it could be part of the path. //with underscores. We are only keeping \ as it could be part of the path.
return fileName.replaceAll("[\\p{Cntrl}/:\"*?<>|]+", "_"); return fileName.replaceAll("[\\p{Cntrl}/:\"*?<>|]+", "_");
} }
/**
* UTF-8 sanitize and escape special characters in a file name or a file name component
*
* @param fileName to escape
*
* @return Sanitized string
*/
public static String utf8SanitizeFileName(String fileName) {
Charset charset = StandardCharsets.UTF_8;
return charset.decode(charset.encode(escapeFileName(fileName))).toString();
}
/** /**
* Test if the current user has read and write access to the dirPath. * Test if the current user has read and write access to the dirPath.