exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

main: provide -E option to redirect stderr to file

Browse source
This commit is contained in:
Mirek Kratochvil 2016-01-11 16:33:15 +01:00
parent a4ce9019e9
commit 46f68fdc93
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/iohelpers.cpp
View file

@ -36,6 +36,15 @@ bool redirect_cout (const std::string& fn)
return true; return true;
} }
bool redirect_cerr (const std::string& fn)
{
static std::ofstream alt_cerr;
alt_cerr.open (fn.c_str(), std::ios::out | std::ios::binary);
if (alt_cerr.fail()) return false;
std::cerr.rdbuf (alt_cerr.rdbuf());
return true;
}
std::string escape_output (const std::string&s) std::string escape_output (const std::string&s)
{ {
std::string r; std::string r;

1
src/iohelpers.h
View file

@ -43,6 +43,7 @@
bool redirect_cin (const std::string& fn); bool redirect_cin (const std::string& fn);
bool redirect_cout (const std::string& fn); bool redirect_cout (const std::string& fn);
bool redirect_cerr (const std::string& fn);
#define readall_bufsize 8192 #define readall_bufsize 8192
template<class output_seq> template<class output_seq>

14
src/main.cpp
View file

@ -42,6 +42,7 @@ void print_help (char*pname)
out ("Global options:"); out ("Global options:");
out (" -R, --in input file, default is stdin"); out (" -R, --in input file, default is stdin");
out (" -o, --out output file, default is stdout"); out (" -o, --out output file, default is stdout");
out (" -E, --err the same for stderr");
out (" -a, --armor use ascii-armored I/O"); out (" -a, --armor use ascii-armored I/O");
out (" -y, --yes assume that answer is `yes' everytime"); out (" -y, --yes assume that answer is `yes' everytime");
outeol; outeol;
@ -120,7 +121,7 @@ int main (int argc, char**argv)
opt_import_no_action = false; opt_import_no_action = false;
std::string recipient, user, std::string recipient, user,
input, output, input, output, err_output,
name, filter, name, filter,
action_param, action_param,
detach_sign, detach_sign,
@ -144,6 +145,7 @@ int main (int argc, char**argv)
//I/O redirection from default stdin/out //I/O redirection from default stdin/out
{"in", 1, 0, 'R' }, {"in", 1, 0, 'R' },
{"out", 1, 0, 'o' }, {"out", 1, 0, 'o' },
{"err", 1, 0, 'E' },
//keyring management //keyring management
{"list", 0, 0, 'k' }, {"list", 0, 0, 'k' },
@ -183,7 +185,7 @@ int main (int argc, char**argv)
option_index = -1; option_index = -1;
c = getopt_long c = getopt_long
(argc, argv, (argc, argv,
"hVTayr:u:R:o:kipx:m:KIPX:M:g:N:F:fnsvedCb:S:", "hVTayr:u:R:o:E:kipx:m:KIPX:M:g:N:F:fnsvedCb:S:",
long_opts, &option_index); long_opts, &option_index);
if (c == -1) break; if (c == -1) break;
@ -231,6 +233,8 @@ int main (int argc, char**argv)
"cannot accept multiple inputs") "cannot accept multiple inputs")
read_single_opt ('o', output, read_single_opt ('o', output,
"cannot accept multiple outputs") "cannot accept multiple outputs")
read_single_opt ('E', err_output,
"cannot accept multiple error outputs")
read_action ('k') read_action ('k')
read_action ('i') read_action ('i')
@ -323,6 +327,12 @@ int main (int argc, char**argv)
goto exit; goto exit;
} }
if (err_output.length() && !redirect_cerr (err_output)) {
progerr ("could not redirect to error output file");
exitval = 1;
goto exit;
}
/* /*
* check the option flags and do whatever was requested * check the option flags and do whatever was requested
*/ */