This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

#5617 Revert "Remove plugin args from ArgParser"

This reverts commit cd58a8f.
  • Loading branch information...
nlyan committed Sep 27, 2016
1 parent b1a991e commit b55b8f00383be23b314e84f51632388408653129
Showing with 11 additions and 4 deletions.
  1. +11 −4 src/lib/synergy/ArgParser.cpp
@@ -189,10 +189,18 @@ ArgParser::parseToolArgs(ToolArgs& args, int argc, const char* const* argv)
args.m_loginAuthenticate = true;
return true;
}
+ else if (isArg(i, argc, argv, NULL, "--get-plugin-list", 0)) {
+ args.m_getPluginList = true;
+ return true;
+ }
else if (isArg(i, argc, argv, NULL, "--get-installed-dir", 0)) {
args.m_getInstalledDir = true;
return true;
}
+ else if (isArg(i, argc, argv, NULL, "--get-plugin-dir", 0)) {
+ args.m_getPluginDir = true;
+ return true;
+ }
else if (isArg(i, argc, argv, NULL, "--get-profile-dir", 0)) {
args.m_getProfileDir = true;
return true;
@@ -322,6 +330,9 @@ ArgParser::parseGenericArgs(int argc, const char* const* argv, int& i)
else if (isArg(i, argc, argv, NULL, "--profile-dir", 1)) {
argsBase().m_profileDirectory = argv[++i];
}
+ else if (isArg(i, argc, argv, NULL, "--plugin-dir", 1)) {
+ argsBase().m_pluginDirectory = argv[++i];
+ }
else {
// option not supported here
return false;
@@ -337,10 +348,6 @@ ArgParser::parseDeprecatedArgs(int argc, const char* const* argv, int& i)
LOG((CLOG_NOTE "--crypto-pass is deprecated"));
i++;
return true;
- } else if (isArg(i, argc, argv, NULL, "--plugin-dir", 1)) {
- LOG((CLOG_NOTE "--plugin-dir is deprecated"));
- ++i;
- return true;
}
return false;

0 comments on commit b55b8f0

Please sign in to comment.