[PATCH v3 0/1] MR6790: ntdll: use __wine_unix_spawnvp() to invoke unmount command.

[Michael Lelli (＠toadking)]

Fix umounting filesystems mounted on paths with spaces.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57391

--
  v3: ntdll: use __wine_unix_spawnvp() to invoke unmount command.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6790

[PATCH v3 1/1] ntdll: use __wine_unix_spawnvp() to invoke unmount command.

[Michael Lelli]

From: Michael Lelli <toadking(a)toadking.com>

Fix umounting filesystems mounted on paths with spaces.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57391
---
 dlls/ntdll/unix/file.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 44adc4f4626..7f007218fcd 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -3976,22 +3976,21 @@ static NTSTATUS unmount_device( HANDLE handle )
             if ((mount_point = get_device_mount_point( st.st_rdev )))
             {
 #ifdef __APPLE__
-                static const char umount[] = "diskutil unmount >/dev/null 2>&1 ";
+                static char diskutil[] = "diskutil";
+                static char unmount[] = "unmount";
+                char *argv[4] = {diskutil, unmount, mount_point, NULL};
 #else
-                static const char umount[] = "umount >/dev/null 2>&1 ";
+                static char umount[] = "umount";
+                char *argv[4] = {umount, mount_point, NULL};
 #endif
-                char *cmd;
-                if (asprintf( &cmd, "%s%s", umount, mount_point ) != -1)
-                {
-                    system( cmd );
-                    free( cmd );
+
+                __wine_unix_spawnvp( argv, TRUE );
+
 #ifdef linux
-                    /* umount will fail to release the loop device since we still have
-                       a handle to it, so we release it here */
-                    if (major(st.st_rdev) == LOOP_MAJOR) ioctl( unix_fd, 0x4c01 /*LOOP_CLR_FD*/, 0 );
+                /* umount will fail to release the loop device since we still have
+                    a handle to it, so we release it here */
+                if (major(st.st_rdev) == LOOP_MAJOR) ioctl( unix_fd, 0x4c01 /*LOOP_CLR_FD*/, 0 );
 #endif
-                }
-                free( mount_point );
             }
         }
         if (needs_close) close( unix_fd );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6790

[Michael Lelli (＠toadking)]

On Fri Nov  8 03:48:35 2024 +0000, Brendan Shanks wrote:
> I think it would be preferable to use `posix_spawn` instead of
> `fork`/`exec`. Or, maybe `__wine_unix_spawnvp()` could be used?
> Good suggestion. I was looking for an internal helper function for this but couldn't find one.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6790#note_86889