- changed static variable name (tee -> bacula_tee)

Changed files:
    bacula-compile.patch -> 1.2

diff --git a/bacula-compile.patch b/bacula-compile.patch
index 1f1e145bd5b7c5fa268c07704e687db1d574cfe8..cc64210c2a00b979b5fa8c1fecc1377440438b33 100644 (file)
--- a/bacula-compile.patch
+++ b/bacula-compile.patch
@@ -9,3 +9,69 @@
  #endif
  
  /* Imported functions */
+@@ -75,7 +75,7 @@
+ static BSOCK *UA_sock = NULL;
+ static DIRRES *dir;
+ static FILE *output = stdout;
+-static bool tee = false;                  /* output to output and stdout */
++static bool bacula_tee = false;                  /* output to output and stdout */
+ static bool stop = false;
+ static int argc;
+ static int numdir;
+@@ -702,7 +702,7 @@
+ {
+    int len;
+    if (!stop) {
+-      if (output == stdout || tee) {
++      if (output == stdout || bacula_tee) {
+          sendit(prompt);
+       }
+    }
+@@ -781,14 +781,14 @@
+ /* Send output to both termina and specified file */
+ static int teecmd(FILE *input, BSOCK *UA_sock)
+ {
+-   tee = true;
++   bacula_tee = true;
+    return do_outputcmd(input, UA_sock);
+ }
+ 
+ /* Send output to specified "file" */
+ static int outputcmd(FILE *input, BSOCK *UA_sock)
+ {
+-   tee = false;
++   bacula_tee = false;
+    return do_outputcmd(input, UA_sock);
+ }
+ 
+@@ -806,7 +806,7 @@
+       if (output != stdout) {
+          fclose(output);
+          output = stdout;
+-         tee = false;
++         bacula_tee = false;
+       }
+       return 1;
+    }
+@@ -865,7 +865,7 @@
+ void sendit(const char *buf)
+ {
+ #ifdef xHAVE_CONIO
+-    if (output == stdout || tee) {
++    if (output == stdout || bacula_tee) {
+        char *p, *q;
+        /*
+         * Here, we convert every \n into \r\n because the
+@@ -890,10 +890,10 @@
+ 
+     fputs(buf, output);
+     fflush(output);
+-    if (tee) {
++    if (bacula_tee) {
+        fputs(buf, stdout);
+     }
+-    if (output != stdout || tee) {
++    if (output != stdout || bacula_tee) {
+        fflush(stdout);
+     }
+ #endif