Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-27 15:57:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed calls to exit() in rsinit. Replaced them by proper return false

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4711 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-12-06 23:00:42 +00:00
parent 4ab319f29e
commit c9fc77f2d1
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretroshare/src/retroshare/rsinit.h
View File

@ -31,6 +31,7 @@
#define RS_INIT_HAVE_ACCOUNT 1 // Initialize ok, have account #define RS_INIT_HAVE_ACCOUNT 1 // Initialize ok, have account
// Initialize failed, result < 0 // Initialize failed, result < 0
#define RS_INIT_AUTH_FAILED -1 // AuthGPG::InitAuth failed #define RS_INIT_AUTH_FAILED -1 // AuthGPG::InitAuth failed
#define RS_INIT_BASE_DIR_ERROR -2 // AuthGPG::InitAuth failed
/**** /****
@ -134,7 +135,7 @@ class RsInit
/* PreLogin */ /* PreLogin */
static std::string getHomePath() ; static std::string getHomePath() ;
static void setupBaseDir(); static bool setupBaseDir();
/* Account Details */ /* Account Details */
static bool get_configinit(const std::string& dir, std::string &id); static bool get_configinit(const std::string& dir, std::string &id);

35
libretroshare/src/rsserver/rsinit.cc
View File

@ -583,7 +583,9 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
AuthSSL::getAuthSSL() -> InitAuth(NULL, NULL, NULL); AuthSSL::getAuthSSL() -> InitAuth(NULL, NULL, NULL);
// first check config directories, and set bootstrap values. // first check config directories, and set bootstrap values.
setupBaseDir(); if(!setupBaseDir())
return RS_INIT_BASE_DIR_ERROR ;
get_configinit(RsInitConfig::basedir, RsInitConfig::preferedId); get_configinit(RsInitConfig::basedir, RsInitConfig::preferedId);
/* Initialize AuthGPG */ /* Initialize AuthGPG */
@ -617,7 +619,7 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
} }
if(!pgpNameFound){ if(!pgpNameFound){
std::cerr << "Invalid User name/GPG id/SSL id: not found in list" << std::endl; std::cerr << "Invalid User name/GPG id/SSL id: not found in list" << std::endl;
exit(1); return RS_INIT_AUTH_FAILED ;
} }
} }
@ -720,7 +722,7 @@ bool RsInit::getAccountDetails(std::string id,
/**************************** Private Functions for InitRetroshare ********************/ /**************************** Private Functions for InitRetroshare ********************/
void RsInit::setupBaseDir() bool RsInit::setupBaseDir()
{ {
// get the default configuration location. // get the default configuration location.
@ -739,7 +741,7 @@ void RsInit::setupBaseDir()
std::cerr << "load_check_basedir() Fatal Error --"; std::cerr << "load_check_basedir() Fatal Error --";
std::cerr << std::endl; std::cerr << std::endl;
std::cerr << "\tcannot determine $HOME dir" <<std::endl; std::cerr << "\tcannot determine $HOME dir" <<std::endl;
exit(1); return false ;
} }
RsInitConfig::basedir = h; RsInitConfig::basedir = h;
RsInitConfig::basedir += "/.retroshare"; RsInitConfig::basedir += "/.retroshare";
@ -778,7 +780,7 @@ void RsInit::setupBaseDir()
if (!RsDirUtil::checkCreateDirectory(RsInitConfig::basedir)) if (!RsDirUtil::checkCreateDirectory(RsInitConfig::basedir))
{ {
std::cerr << "Cannot Create BaseConfig Dir" << std::endl; std::cerr << "Cannot Create BaseConfig Dir" << std::endl;
exit(1); return false ;
} }
RsInitConfig::basedir += "\\RetroShare"; RsInitConfig::basedir += "\\RetroShare";
} }
@ -791,8 +793,9 @@ void RsInit::setupBaseDir()
if (!RsDirUtil::checkCreateDirectory(RsInitConfig::basedir)) if (!RsDirUtil::checkCreateDirectory(RsInitConfig::basedir))
{ {
std::cerr << "Cannot Create BaseConfig Dir:" << RsInitConfig::basedir << std::endl; std::cerr << "Cannot Create BaseConfig Dir:" << RsInitConfig::basedir << std::endl;
exit(1); return false ;
} }
return true ;
} }
@ -911,7 +914,7 @@ bool getAvailableAccounts(std::list<accountId> &ids)
if (!dirIt.isValid()) if (!dirIt.isValid())
{ {
std::cerr << "Cannot Open Base Dir - No Available Accounts" << std::endl; std::cerr << "Cannot Open Base Dir - No Available Accounts" << std::endl;
exit(1); return false ;
} }
struct stat64 buf; struct stat64 buf;
@ -1222,7 +1225,9 @@ bool RsInit::GenerateSSLCertificate(const std::string& gpg_id, const std::st
std::string tmpdir = "TMPCFG"; std::string tmpdir = "TMPCFG";
std::string tmpbase = RsInitConfig::basedir + "/" + tmpdir + "/"; std::string tmpbase = RsInitConfig::basedir + "/" + tmpdir + "/";
RsInit::setupAccount(tmpbase);
if(!RsInit::setupAccount(tmpbase))
return false ;
/* create directory structure */ /* create directory structure */
@ -1371,32 +1376,32 @@ bool RsInit::setupAccount(const std::string& accountdir)
if (!RsDirUtil::checkCreateDirectory(accountdir)) if (!RsDirUtil::checkCreateDirectory(accountdir))
{ {
std::cerr << "Cannot Create BaseConfig Dir" << std::endl; std::cerr << "Cannot Create BaseConfig Dir" << std::endl;
exit(1); return false ;
} }
if (!RsDirUtil::checkCreateDirectory(subdir1)) if (!RsDirUtil::checkCreateDirectory(subdir1))
{ {
std::cerr << "Cannot Create Config/Key Dir" << std::endl; std::cerr << "Cannot Create Config/Key Dir" << std::endl;
exit(1); return false ;
} }
if (!RsDirUtil::checkCreateDirectory(subdir2)) if (!RsDirUtil::checkCreateDirectory(subdir2))
{ {
std::cerr << "Cannot Create Config/Cert Dir" << std::endl; std::cerr << "Cannot Create Config/Cert Dir" << std::endl;
exit(1); return false ;
} }
if (!RsDirUtil::checkCreateDirectory(subdir3)) if (!RsDirUtil::checkCreateDirectory(subdir3))
{ {
std::cerr << "Cannot Create Config/Cache Dir" << std::endl; std::cerr << "Cannot Create Config/Cache Dir" << std::endl;
exit(1); return false ;
} }
if (!RsDirUtil::checkCreateDirectory(subdir4)) if (!RsDirUtil::checkCreateDirectory(subdir4))
{ {
std::cerr << "Cannot Create Config/Cache/local Dir" << std::endl; std::cerr << "Cannot Create Config/Cache/local Dir" << std::endl;
exit(1); return false ;
} }
if (!RsDirUtil::checkCreateDirectory(subdir5)) if (!RsDirUtil::checkCreateDirectory(subdir5))
{ {
std::cerr << "Cannot Create Config/Cache/remote Dir" << std::endl; std::cerr << "Cannot Create Config/Cache/remote Dir" << std::endl;
exit(1); return false ;
} }
return true; return true;
@ -1810,7 +1815,7 @@ int RsServer::StartupRetroShare()
std::cerr << "main() - Fatal Error....." << std::endl; std::cerr << "main() - Fatal Error....." << std::endl;
std::cerr << "Invalid Certificate configuration!" << std::endl; std::cerr << "Invalid Certificate configuration!" << std::endl;
std::cerr << std::endl; std::cerr << std::endl;
exit(1); return false ;
} }
std::string ownId = AuthSSL::getAuthSSL()->OwnId(); std::string ownId = AuthSSL::getAuthSSL()->OwnId();