bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Search config file sequence is changed

Browse Source
This commit is contained in:
Stas Degteff
2006-01-21 00:54:18 +00:00
parent 53a185b293
commit 348b78be9d
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
golded3/gefn.h
View File

@@ -40,6 +40,8 @@
#define GEDCFG2 "gedw32.cfg"
#elif defined(__DOS__) || defined(__MSDOS__)
#define GEDCFG2 "geddos.cfg"
#elif defined(__UNIX__)
#define GEDCFG2 "golded.conf"
#endif
#endif /* GEDCFG2 */
@@ -98,7 +100,7 @@
#ifndef CFGUSERPATH1
#ifdef __UNIX__
#define CFGUSERPATH1 "~/.golded/"
#define CFGUSERPATH1 "~/.golded"
#endif
#endif

9
golded3/geinit.cpp
View File

@@ -458,6 +458,7 @@ static bool FindCfg(char* path) {
return false;
}
AddBackslash(path);
#ifdef GEDCFG2
found = ExistCfg(path, GEDCFG2);
#endif
@@ -561,7 +562,7 @@ void Initialize(int argc, char* argv[]) {
// Print commandline help and exit if requested
if (cmdlinehelp)
{
{
STD_PRINTNL("Copyright (C) 1990-2005 Odinn Sorensen, Alexander Aganichev, Jacobo Tarrio,");
STD_PRINTNL(" Stas Degteff and others");
STD_PRINTNL("-------------------------------------------------------------------------------");
@@ -631,7 +632,7 @@ void Initialize(int argc, char* argv[]) {
// Get it in user directory (step 1)
if(not found) {
strxcpy(cmdlinecfg, CFGUSERPATH1, sizeof(cmdlinecfg));
getcwd(cmdlinecfg, sizeof(cmdlinecfg));
strschg_environ(cmdlinecfg);
found = FindCfg(cmdlinecfg);
}
#endif
@@ -639,7 +640,7 @@ void Initialize(int argc, char* argv[]) {
// Get it in user directory (step 2)
if(not found) {
strxcpy(cmdlinecfg, CFGUSERPATH2, sizeof(cmdlinecfg));
getcwd(cmdlinecfg, sizeof(cmdlinecfg));
strschg_environ(cmdlinecfg);
found = FindCfg(cmdlinecfg);
}
#endif
@@ -647,7 +648,7 @@ void Initialize(int argc, char* argv[]) {
// Get it in system config directory
if(not found) {
strxcpy(cmdlinecfg, CFGPATH, sizeof(cmdlinecfg));
getcwd(cmdlinecfg, sizeof(cmdlinecfg));
strschg_environ(cmdlinecfg);
found = FindCfg(cmdlinecfg);
}
#endif