blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-10 01:29:05 -04:00
Code Issues Projects Releases Wiki Activity

ncls: don't create Ncpp ctx until post-getopt #1194

Browse Source
This commit is contained in:
nick black 2020-12-08 15:47:49 -05:00
parent 42ac6bb90b
commit e7f208342f
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ls/main.cpp
View File

@ -1,3 +1,4 @@
#define NCPP_EXCEPTIONS_PLEASE
#include <cstdlib>
#include <fcntl.h>
#include <iostream>
@ -134,27 +135,24 @@ list_paths(const char* const * argv, const lsContext& ctx){
}
int main(int argc, char* const * argv){
lsContext ctx = {
.nc = ncpp::Direct(),
.longlisting = false,
.recursedirs = false,
.directories = false,
.dereflinks = false,
};
bool directories = false;
bool recursedirs = false;
bool longlisting = false;
bool dereflinks = false;
int c;
while((c = getopt(argc, argv, "dhlLR")) != -1){
switch(c){
case 'd':
ctx.directories = true;
directories = true;
break;
case 'l':
ctx.longlisting = true;
longlisting = true;
break;
case 'L':
ctx.dereflinks = true;
dereflinks = true;
break;
case 'R':
ctx.recursedirs = true;
recursedirs = true;
break;
case 'h':
usage(std::cout, argv[0], EXIT_SUCCESS);
@ -164,6 +162,13 @@ int main(int argc, char* const * argv){
break;
}
}
lsContext ctx = {
.nc = ncpp::Direct(),
.longlisting = longlisting,
.recursedirs = recursedirs,
.directories = directories,
.dereflinks = dereflinks,
};
static const char* const default_args[] = { ".", nullptr };
list_paths(argv[optind] ? argv + optind : default_args, ctx);
return EXIT_SUCCESS;