Module: wine Branch: master Commit: abcbd85b7c2018eedf0c644fde6b8234b99439ec URL: https://gitlab.winehq.org/wine/wine/-/commit/abcbd85b7c2018eedf0c644fde6b823...
Author: Brendan Shanks bshanks@codeweavers.com Date: Wed Mar 27 10:53:57 2024 -0700
ntdll: Simplify creation of the server directory.
---
dlls/ntdll/unix/server.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index c1ee8e27f0c..438c16518bd 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1232,23 +1232,11 @@ int server_pipe( int fd[2] ) static const char *init_server_dir( dev_t dev, ino_t ino ) { char *dir = NULL; - int p; - char tmp[2 * sizeof(dev) + 2 * sizeof(ino) + 2]; - - if (dev != (unsigned long)dev) - p = snprintf( tmp, sizeof(tmp), "%lx%08lx-", (unsigned long)((unsigned long long)dev >> 32), (unsigned long)dev ); - else - p = snprintf( tmp, sizeof(tmp), "%lx-", (unsigned long)dev ); - - if (ino != (unsigned long)ino) - snprintf( tmp + p, sizeof(tmp) - p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino ); - else - snprintf( tmp + p, sizeof(tmp) - p, "%lx", (unsigned long)ino );
#ifdef __ANDROID__ /* there's no /tmp dir on Android */ - asprintf( &dir, "%s/.wineserver/server-%s", config_dir, tmp ); + asprintf( &dir, "%s/.wineserver/server-%llx-%llx", config_dir, (unsigned long long)dev, (unsigned long long)ino ); #else - asprintf( &dir, "/tmp/.wine-%u/server-%s", getuid(), tmp ); + asprintf( &dir, "/tmp/.wine-%u/server-%llx-%llx", getuid(), (unsigned long long)dev, (unsigned long long)ino ); #endif return dir; }