1 --- bacula-1.38.11/src/console/console.c.orig 2006-10-20 08:02:49.000000000 +0000
2 +++ bacula-1.38.11/src/console/console.c 2006-10-20 08:03:04.000000000 +0000
7 -extern int rl_catch_signals;
8 +extern "C" int rl_catch_signals;
11 /* Imported functions */
13 static BSOCK *UA_sock = NULL;
15 static FILE *output = stdout;
16 -static bool tee = false; /* output to output and stdout */
17 +static bool bacula_tee = false; /* output to output and stdout */
18 static bool stop = false;
25 - if (output == stdout || tee) {
26 + if (output == stdout || bacula_tee) {
31 /* Send output to both termina and specified file */
32 static int teecmd(FILE *input, BSOCK *UA_sock)
36 return do_outputcmd(input, UA_sock);
39 /* Send output to specified "file" */
40 static int outputcmd(FILE *input, BSOCK *UA_sock)
44 return do_outputcmd(input, UA_sock);
48 if (output != stdout) {
57 void sendit(const char *buf)
60 - if (output == stdout || tee) {
61 + if (output == stdout || bacula_tee) {
64 * Here, we convert every \n into \r\n because the
73 - if (output != stdout || tee) {
74 + if (output != stdout || bacula_tee) {