philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix macOS build

Browse source 
macOS doesn't have GLOB_ONLYDIR.
This commit is contained in:
Eelco Dolstra 2020-05-12 11:08:59 +02:00
parent 649c2db308
commit 437614b479
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/libutil/args.cc
View file

@ -220,25 +220,35 @@ Args::Flag Args::Flag::mkHashTypeFlag(std::string && longName, HashType * ht)
}; };
} }
static void completePath(std::string_view prefix, int flags) static void completePath(std::string_view prefix, bool onlyDirs)
{ {
pathCompletions = true; pathCompletions = true;
glob_t globbuf; glob_t globbuf;
if (glob((std::string(prefix) + "*").c_str(), GLOB_NOESCAPE | GLOB_TILDE | flags, nullptr, &globbuf) == 0) { int flags = GLOB_NOESCAPE | GLOB_TILDE;
for (size_t i = 0; i < globbuf.gl_pathc; ++i) #ifdef GLOB_ONLYDIR
if (onlyDirs)
flags |= GLOB_ONLYDIR;
#endif
if (glob((std::string(prefix) + "*").c_str(), flags, nullptr, &globbuf) == 0) {
for (size_t i = 0; i < globbuf.gl_pathc; ++i) {
if (onlyDirs) {
auto st = lstat(globbuf.gl_pathv[i]);
if (!S_ISDIR(st.st_mode)) continue;
}
completions->insert(globbuf.gl_pathv[i]); completions->insert(globbuf.gl_pathv[i]);
}
globfree(&globbuf); globfree(&globbuf);
} }
} }
void completePath(size_t, std::string_view prefix) void completePath(size_t, std::string_view prefix)
{ {
completePath(prefix, 0); completePath(prefix, false);
} }
void completeDir(size_t, std::string_view prefix) void completeDir(size_t, std::string_view prefix)
{ {
completePath(prefix, GLOB_ONLYDIR); completePath(prefix, true);
} }
Strings argvToStrings(int argc, char * * argv) Strings argvToStrings(int argc, char * * argv)