ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set STDOUT correctly in compat mode

Browse source
This commit is contained in:
Con Kolivas 2015-04-16 15:59:37 +10:00
parent d7ebee9640
commit fbd56ce9c7
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
main.c
View file

@ -242,6 +242,14 @@ static struct option long_options[] = {
{0, 0, 0, 0}, {0, 0, 0, 0},
}; };
static void set_stdout(struct rzip_control *control)
{
control->flags |= FLAG_STDOUT;
control->outFILE = stdout;
control->msgout = stderr;
register_outputfile(control, control->msgout);
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
bool lrzcat = false, compat = false; bool lrzcat = false, compat = false;
@ -295,7 +303,7 @@ int main(int argc, char *argv[])
break; break;
case 'c': case 'c':
if (compat) { if (compat) {
control->flags |= FLAG_STDOUT; set_stdout(control);
break; break;
} }
case 'C': case 'C':
@ -504,15 +512,11 @@ int main(int argc, char *argv[])
if (INFO && STDIN) if (INFO && STDIN)
failure("Will not get file info from STDIN\n"); failure("Will not get file info from STDIN\n");
/* If no output filename is specified, and we're using
* stdin, use stdout */
if ((control->outname && (strcmp(control->outname, "-") == 0)) || if ((control->outname && (strcmp(control->outname, "-") == 0)) ||
/* If no output filename is specified, and we're using (!control->outname && STDIN) || lrzcat)
* stdin, use stdout */ set_stdout(control);
(!control->outname && STDIN) || lrzcat ) {
control->flags |= FLAG_STDOUT;
control->outFILE = stdout;
control->msgout = stderr;
register_outputfile(control, control->msgout);
}
if (lrzcat) { if (lrzcat) {
control->msgout = stderr; control->msgout = stderr;
@ -540,7 +544,7 @@ int main(int argc, char *argv[])
usage(compat); usage(compat);
exit (1); exit (1);
} }
if (!TEST_ONLY && STDOUT && isatty(fileno((FILE *)stdout))) { if (!TEST_ONLY && STDOUT && isatty(fileno((FILE *)stdout)) && !compat) {
print_err("Will not write stdout to a terminal. Use -f to override.\n"); print_err("Will not write stdout to a terminal. Use -f to override.\n");
usage(compat); usage(compat);
exit (1); exit (1);