Don't create the WINEPREFIX directory if it doesn't exist.

This commit is contained in:
Alexandre Julliard 2001-08-09 21:22:33 +00:00
parent e994d5036e
commit b8dd37d239
2 changed files with 5 additions and 6 deletions

View File

@ -382,7 +382,6 @@ const char *get_config_dir(void)
strcpy( confdir, home ); strcpy( confdir, home );
strcat( confdir, CONFDIR ); strcat( confdir, CONFDIR );
} }
mkdir( confdir, 0755 ); /* just in case */
} }
return confdir; return confdir;
} }

View File

@ -41,7 +41,7 @@
/* path names for server master Unix socket */ /* path names for server master Unix socket */
#define CONFDIR "/.wine" /* directory for Wine config relative to $HOME */ #define CONFDIR "/.wine" /* directory for Wine config relative to $HOME */
#define SERVERDIR "/wineserver-" /* server socket directory (hostname appended) */ #define SERVERDIR "wineserver-" /* server socket directory (hostname appended) */
#define SOCKETNAME "socket" /* name of the socket file */ #define SOCKETNAME "socket" /* name of the socket file */
struct master_socket struct master_socket
@ -388,7 +388,6 @@ const char *get_config_dir(void)
strcpy( confdir, home ); strcpy( confdir, home );
strcat( confdir, CONFDIR ); strcat( confdir, CONFDIR );
} }
mkdir( confdir, 0755 ); /* just in case */
} }
return confdir; return confdir;
} }
@ -403,11 +402,12 @@ static void create_server_dir(void)
if (gethostname( hostname, sizeof(hostname) ) == -1) fatal_perror( "gethostname" ); if (gethostname( hostname, sizeof(hostname) ) == -1) fatal_perror( "gethostname" );
if (!(serverdir = malloc( strlen(confdir) + strlen(SERVERDIR) + strlen(hostname) + 1 ))) if (!(serverdir = malloc( strlen(SERVERDIR) + strlen(hostname) + 1 )))
fatal_error( "out of memory\n" ); fatal_error( "out of memory\n" );
strcpy( serverdir, confdir ); if (chdir( confdir ) == -1) fatal_perror( "chdir %s", confdir );
strcat( serverdir, SERVERDIR );
strcpy( serverdir, SERVERDIR );
strcat( serverdir, hostname ); strcat( serverdir, hostname );
if (chdir( serverdir ) == -1) if (chdir( serverdir ) == -1)