mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
other_osx_patch
This commit is contained in:
parent
699299ae8a
commit
1f9cb27bbd
@ -86,8 +86,11 @@ int main(int argc, char **argv)
|
||||
// unfinished
|
||||
//args >> parameter("http-listen", listenAddress, "ipv6 address", "Listen only on the specified address.", false);
|
||||
args >> option("http-allow-all", allowAllIps, "allow connections from all IP adresses (default= localhost only)");
|
||||
#ifdef __APPLE__
|
||||
args >> help('h',"help","Display this Help");
|
||||
#else
|
||||
args >> help();
|
||||
|
||||
#endif
|
||||
if (args.helpRequested())
|
||||
{
|
||||
std::cerr << args.usage() << std::endl;
|
||||
@ -99,7 +102,7 @@ int main(int argc, char **argv)
|
||||
|
||||
resource_api::ApiServer api;
|
||||
resource_api::RsControlModule ctrl_mod(argc, argv, api.getStateTokenServer(), &api, true);
|
||||
api.addResourceHandler("control", dynamic_cast<resource_api::ResourceRouter*>(&ctrl_mod), &resource_api::RsControlModule::handleRequest);
|
||||
api.addResourceHandler("control", dynamic_cast<resource_api::ResourceRouter*>(&ctrl_mod), &resource_api::RsControlModule::handleRequest);
|
||||
|
||||
resource_api::ApiServerMHD* httpd = 0;
|
||||
if(httpPort != 0)
|
||||
@ -192,8 +195,11 @@ int main(int argc, char **argv)
|
||||
>> parameter('P',"ssh-p-hash" ,sshPwdHash ,"hash" ,"Ssh login password hash (Generated by retroshare-nogui -G)",false)
|
||||
>> parameter('K',"ssh-key-file" ,sshRsaFile ,"RSA key file", "RSA key file for SSH login (not yet implemented).",false )// NOT FINISHED YET.
|
||||
|
||||
#ifdef __APPLE__
|
||||
>> help('h',"help","Display this Help");
|
||||
#else
|
||||
>> help() ;
|
||||
|
||||
#endif
|
||||
// Normally argstream would handle this by itself, if we called
|
||||
// as.defaultErrorHandling() ;
|
||||
//
|
||||
|
Loading…
Reference in New Issue
Block a user