system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 16:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

libwine: Don't add a user id to the server directory if not supported.

Browse source
This commit is contained in:
Alexandre Julliard 2013-09-16 12:43:07 +02:00
parent 16c8ca8082
commit 876189a405
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/wine/config.c
View file

@ -36,7 +36,7 @@
#include "wine/library.h"
static const char server_config_dir[] = "/.wine"; /* config dir relative to $HOME */
static const char server_root_prefix[] = "/tmp/.wine-"; /* prefix for server root dir */
static const char server_root_prefix[] = "/tmp/.wine"; /* prefix for server root dir */
static const char server_dir_prefix[] = "/server-"; /* prefix for server dir */
static char *bindir;
@ -220,16 +220,18 @@ static char *get_runtime_argvdir( const char *argv0 )
/* initialize the server directory value */
static void init_server_dir( dev_t dev, ino_t ino )
{
char *p;
char *p, *root;
#ifdef HAVE_GETUID
const unsigned int uid = getuid();
root = xmalloc( sizeof(server_root_prefix) + 12 );
sprintf( root, "%s-%u", server_root_prefix, getuid() );
#else
const unsigned int uid = 0;
root = xstrdup( server_root_prefix );
#endif
server_dir = xmalloc( sizeof(server_root_prefix) + 32 + sizeof(server_dir_prefix) +
2*sizeof(dev) + 2*sizeof(ino) );
sprintf( server_dir, "%s%u%s", server_root_prefix, uid, server_dir_prefix );
server_dir = xmalloc( strlen(root) + sizeof(server_dir_prefix) + 2*sizeof(dev) + 2*sizeof(ino) + 2 );
strcpy( server_dir, root );
strcat( server_dir, server_dir_prefix );
p = server_dir + strlen(server_dir);
if (dev != (unsigned long)dev)
@ -241,6 +243,7 @@ static void init_server_dir( dev_t dev, ino_t ino )
sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino );
else
sprintf( p, "%lx", (unsigned long)ino );
free( root );
}
/* retrieve the default dll dir */