SOURCES: bacula-compile.patch - changed static variable name (tee ...
sls
sls at pld-linux.org
Sun Dec 24 14:34:57 CET 2006
Author: sls Date: Sun Dec 24 13:34:57 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- changed static variable name (tee -> bacula_tee)
---- Files affected:
SOURCES:
bacula-compile.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/bacula-compile.patch
diff -u SOURCES/bacula-compile.patch:1.1 SOURCES/bacula-compile.patch:1.2
--- SOURCES/bacula-compile.patch:1.1 Fri Oct 20 19:43:30 2006
+++ SOURCES/bacula-compile.patch Sun Dec 24 14:34:52 2006
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/bacula-compile.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list