opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned selecting stdout or stderr for messages from ntfsclone 

Depending on the options selected, ntfsclone messages are output on
stdout or stderr. This is now done through standard logging procedures.
edge.strict_endians
Jean-Pierre André 2013-02-09 12:12:02 +01:00
parent 2e2550026e
commit c4f65e05c4
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ntfsprogs/ntfsclone.c
View File

@ -504,26 +504,16 @@ static void parse_options(int argc, char **argv)
}
}
msg_out = stdout;
/* FIXME: this is a workaround for losing debug info if stdout != stderr
and for the uncontrollable verbose messages in libntfs. Ughhh. */
if (opt.std_out)
/*
* Send messages, debug information and library messages to stdout,
* but, if outputing to stdout send them to stderr
*/
if (opt.std_out) {
msg_out = stderr;
else if (opt.debug) {
/* Redirect stderr to stdout, note fflush()es are essential! */
fflush(stdout);
fflush(stderr);
if (dup2(STDOUT_FILENO, STDERR_FILENO) == -1) {
perror("Failed to redirect stderr to stdout");
exit(1);
}
fflush(stdout);
fflush(stderr);
ntfs_log_set_handler(ntfs_log_handler_stderr);
} else {
fflush(stderr);
if (!freopen("/dev/null", "w", stderr))
perr_exit("Failed to redirect stderr to /dev/null");
msg_out = stdout;
ntfs_log_set_handler(ntfs_log_handler_outerr);
}
}