ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added PROFILE_GetConfigDir function.

This commit is contained in:
Alexandre Julliard 2000-01-25 01:35:01 +00:00
parent cb1fc735f0
commit 647876e598
2 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
files/profile.c
View File

@ -8,8 +8,10 @@
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <pwd.h>
#include <unistd.h>
#include "winbase.h"
#include "winerror.h"
@ -19,6 +21,7 @@
#include "file.h"
#include "heap.h"
#include "debugtools.h"
#include "xmalloc.h"
#include "options.h"
DEFAULT_DEBUG_CHANNEL(profile)
@ -71,11 +74,43 @@ static char PROFILE_WineIniUsed[MAX_PATHNAME_LEN] = "";
#define IS_ENTRY_COMMENT(str) ((str)[0] == ';')
#define WINE_INI_GLOBAL ETCDIR "/wine.conf"
#define WINE_CONFIG_DIR "/.wine" /* config dir inside $HOME */
static LPCWSTR wininiW = NULL;
static CRITICAL_SECTION PROFILE_CritSect;
/***********************************************************************
* PROFILE_GetConfigDir
*
* Return the name of the configuration directory ($HOME/.wine)
*/
const char *PROFILE_GetConfigDir(void)
{
static char *confdir;
if (!confdir)
{
const char *home = getenv( "HOME" );
if (!home)
{
struct passwd *pwd = getpwuid( getuid() );
if (!pwd)
{
fprintf( stderr, "wine: could not find your home directory\n" );
exit(1);
}
home = pwd->pw_dir;
}
confdir = xmalloc( strlen(home) + strlen(WINE_CONFIG_DIR) + 1 );
strcpy( confdir, home );
strcat( confdir, WINE_CONFIG_DIR );
mkdir( confdir, 0755 ); /* create it just in case */
}
return confdir;
}
/***********************************************************************
* PROFILE_CopyEntry
*
@ -379,16 +414,13 @@ static BOOL PROFILE_FlushFile(void)
{
/* Try to create it in $HOME/.wine */
/* FIXME: this will need a more general solution */
if ((p = getenv( "HOME" )) != NULL)
{
strcpy( buffer, p );
strcat( buffer, "/.wine/" );
p = buffer + strlen(buffer);
strcpy( p, strrchr( CurProfile->dos_name, '\\' ) + 1 );
CharLowerA( p );
file = fopen( buffer, "w" );
unix_name = buffer;
}
strcpy( buffer, PROFILE_GetConfigDir() );
p = buffer + strlen(buffer);
*p++ = '/';
strcpy( p, strrchr( CurProfile->dos_name, '\\' ) + 1 );
CharLowerA( p );
file = fopen( buffer, "w" );
unix_name = buffer;
}
if (!file)
@ -516,19 +548,16 @@ static BOOL PROFILE_Open( LPCSTR filename )
/* Try to open the profile file, first in $HOME/.wine */
/* FIXME: this will need a more general solution */
if ((p = getenv( "HOME" )) != NULL)
strcpy( buffer, PROFILE_GetConfigDir() );
p = buffer + strlen(buffer);
*p++ = '/';
strcpy( p, strrchr( newdos_name, '\\' ) + 1 );
CharLowerA( p );
if ((file = fopen( buffer, "r" )))
{
strcpy( buffer, p );
strcat( buffer, "/.wine/" );
p = buffer + strlen(buffer);
strcpy( p, strrchr( newdos_name, '\\' ) + 1 );
CharLowerA( p );
if ((file = fopen( buffer, "r" )))
{
TRACE("(%s): found it in %s\n",
filename, buffer );
CurProfile->unix_name = HEAP_strdupA( SystemHeap, 0, buffer );
}
TRACE("(%s): found it in %s\n",
filename, buffer );
CurProfile->unix_name = HEAP_strdupA( SystemHeap, 0, buffer );
}
if (!file)

1
include/options.h
View File

@ -84,6 +84,7 @@ extern struct options Options;
/* Profile functions */
extern const char *PROFILE_GetConfigDir(void);
extern int PROFILE_LoadWineIni(void);
extern void PROFILE_UsageWineIni(void);
extern int PROFILE_GetWineIniString( const char *section, const char *key_name,