zawz/zmidimap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed stdin method

Browse source
This commit is contained in:
zawz 2020-02-18 16:17:54 +01:00
parent 2b8da6aa30
commit 6ff844b772
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main.cpp
View file

@ -23,7 +23,6 @@ void help()
printf("zmidimap [options] <file>\n\nOptions:\n"); printf("zmidimap [options] <file>\n\nOptions:\n");
options.print_help(4, 25); options.print_help(4, 25);
printf("\n"); printf("\n");
printf("If piped, the map file will be read from standard input\n");
printf("See --mim-format --zfd-format --command-tags --shell-format options for details on map file format\n"); printf("See --mim-format --zfd-format --command-tags --shell-format options for details on map file format\n");
} }
@ -119,10 +118,7 @@ int main(int argc, char* argv[])
signal(SIGINT, inthandler); signal(SIGINT, inthandler);
signal(SIGCHLD, SIG_IGN); //not expecting returns from child processes signal(SIGCHLD, SIG_IGN); //not expecting returns from child processes
bool piped=false;
bool autoreload=true; bool autoreload=true;
if (!isatty(fileno(stdin)))
piped = true;
options.add(ztd::option("\r [Help]")); options.add(ztd::option("\r [Help]"));
options.add(ztd::option('h',"help", false, "Display this help message")); options.add(ztd::option('h',"help", false, "Display this help message"));
@ -238,17 +234,15 @@ int main(int argc, char* argv[])
if (arg.size() <= 0 || arg[0] == "") if (arg.size() <= 0 || arg[0] == "")
{ {
no_arg=true; no_arg=true;
if(!piped) help();
{ stop(0);
help();
stop(0);
}
} }
else else
{ {
filepath=arg[0]; filepath=arg[0];
} }
if(filepath == "-")
filepath = "/dev/stdin";
//main processing //main processing
try try