tweak click-opening WSL files (mintty/wsltty#115)

src/winmain.c

@@ -3752,7 +3752,22 @@ getlxssinfo(bool list, wstring wslname, uint * wsl_ver,
       }
     }
     else {  // legacy
-      rootfs = wcsdup(bp);
+      rootfs = newn(wchar, wcslen(bp) + 8);
+      wcscpy(rootfs, bp);
+      wcscat(rootfs, W("\\rootfs"));
+
+      char * rootdir = path_win_w_to_posix(rootfs);
+      struct stat fstat_buf;
+      if (stat (rootdir, & fstat_buf) == 0 && S_ISDIR (fstat_buf.st_mode)) {
+        // non-app or imported deployment
+      }
+      else {
+        // legacy Bash on Windows
+        free(rootfs);
+        rootfs = wcsdup(bp);
+      }
+      free(rootdir);
+
       icon = legacy_icon();
     }
 
@@ -3784,10 +3799,22 @@ getlxssinfo(bool list, wstring wslname, uint * wsl_ver,
       printf("-- icon %ls\n", icon);
     }
 
+    *wsl_icon = icon;
     *wsl_ver = 1 + ((getregval(lxss, guid, W("Flags")) >> 3) & 1);
     *wsl_guid = cs__wcstoutf(guid);
-    *wsl_rootfs = rootfs;
-    *wsl_icon = icon;
+    char * rootdir = path_win_w_to_posix(rootfs);
+    struct stat fstat_buf;
+    if (stat (rootdir, & fstat_buf) == 0 && S_ISDIR (fstat_buf.st_mode)) {
+      *wsl_rootfs = rootfs;
+    }
+    else {
+      free(rootfs);
+      rootfs = newn(wchar, wcslen(wslname) + 8);
+      wcscpy(rootfs, W("\\\\wsl$\\"));
+      wcscat(rootfs, wslname);
+      *wsl_rootfs = rootfs;
+    }
+    free(rootdir);
     return 0;
   }
 

wiki/Changelog.md

@@ -8,6 +8,7 @@ Window handling
   * Prevent mouse wheel double interpretation, also fixing speed issues (mintty/wsltty#238).
   * Handle proper link attributes when screen is scrolled (#1021).
   * Image saving feature for terminal contents (png format), DEC and Tek.
+  * Tweak click-opening WSL files (mintty/wsltty#115).
 
 Configuration
   * Support resource configuration directories via links (#1016).