The user home directory prefix (~) is now only expanded when followed by a slash…

The user home directory prefix (~) is now only expanded when followed by a slash or backslash, or standing alone.

h2/src/main/org/h2/store/fs/FileSystemDisk.java

@@ -57,7 +57,20 @@ public class FileSystemDisk extends FileSystem {
      * @return the native file name
      */
     protected String translateFileName(String fileName) {
-        if (fileName != null && fileName.startsWith("~")) {
+        return expandUserHomeDirectory(fileName);
+    }
+
+    /**
+     * Expand '~' to the user home directory. It is only be expanded if the ~ stands alone, or is followed by / or \.
+     *
+     * @param fileName the file name
+     * @return the native file name
+     */
+    public static String expandUserHomeDirectory(String fileName) {
+        if (fileName == null) {
+            return null;
+        }
+        if (fileName.startsWith("~") && (fileName.length() == 1 || fileName.startsWith("~/") || fileName.startsWith("~\\"))) {
             String userDir = SysProperties.USER_HOME;
             fileName = userDir + fileName.substring(1);
         }

h2/src/main/org/h2/store/fs/FileSystemZip.java

@@ -15,8 +15,6 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-
-import org.h2.constant.SysProperties;
 import org.h2.message.Message;
 import org.h2.util.New;
 
@@ -230,11 +228,7 @@ public class FileSystemZip extends FileSystem {
         if (idx >= 0) {
             fileName = fileName.substring(0, idx);
         }
-        if (fileName.startsWith("~")) {
-            String userDir = SysProperties.USER_HOME;
-            fileName = userDir + fileName.substring(1);
-        }
-        return fileName;
+        return FileSystemDisk.expandUserHomeDirectory(fileName);
     }
 
     private String getEntryName(String fileName) {