Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 16:09:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Close tracker id 2994519 by applying patch, looks clean to me.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2870 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
astei 2010-05-08 21:44:08 +00:00
parent 4a410fbfb6
commit f2f7a3b77d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/rsiface/rsinit.h
View File

@ -42,7 +42,9 @@ class RsInit
/* PreLogin */
static void InitRsConfig() ;
static int InitRetroShare(int argc, char **argv);
static int InitRetroShare(int argc, char **argv,
bool strictCheck=true);
static char dirSeperator();
static bool isPortable();

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

@ -251,7 +251,7 @@ void RsInit::InitRsConfig()
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
#ifndef WINDOWS_SYS
int RsInit::InitRetroShare(int argc, char **argv)
int RsInit::InitRetroShare(int argc, char **argv, bool strictCheck)
{
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
#else
@ -262,7 +262,7 @@ int RsInit::InitRetroShare(int argc, char **argv)
#include <pthread.h>
#endif
int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored)
int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck)
{
/* THIS IS A HACK TO ALLOW WINDOWS TO ACCEPT COMMANDLINE ARGUMENTS */
@ -404,9 +404,11 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored)
exit(1);
break;
default:
std::cerr << "Unknown Option!" << std::endl;
std::cerr << "Use '-h' for help." << std::endl;
exit(1);
if (strictCheck) {
std::cerr << "Unknown Option!" << std::endl;
std::cerr << "Use '-h' for help." << std::endl;
exit(1);
}
}
}