Windows: simplified recollindex argument passing.

Because of the use of wmain(), we don't need the imperfect method of using
a temporary file. This should have been simplified when switching to wmain
but was not for lack of time.
This commit is contained in:
Jean-Francois Dockes
2021-02-25 15:30:17 +00:00
parent 46ccac27a4
commit 818b79b135
5 changed files with 3 additions and 79 deletions
-20
View File
@@ -574,19 +574,6 @@ static vector<string> argstovector(int argc, wchar_t **argv)
return args;
}
static vector<string> fileToArgs(const string& fn)
{
string reason, data;
if (!file_to_string(fn, data, &reason)) {
std::cerr << "Failed reading args file " << fn << " reason " <<
reason << "\n";
exit(1);
}
vector<string> args;
stringToStrings(data, args);
return args;
}
// Working directory before we change: it's simpler to change early
// but some options need the original for computing absolute paths.
@@ -615,13 +602,6 @@ int main(int argc, char *argv[])
vector<string> args = argstovector(argc, argv);
// Passing args through a temp file: this is used on Windows to
// avoid issues with charsets in args (thought to avoid using
// wmain, which proved false, but the args file was kept)
if (args.size() == 1 && args[0][0] != '-') {
args = fileToArgs(args[0]);
}
vector<string> selpatterns;
int sleepsecs{60};
string a_config;