Correct improperly formated list command output reported by Dan.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3249 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kernstodo b/bacula/kernstodo
index b2b20ac95a6d341ac570d250c5a3a8b6b6dc2d0d..be2860a656f06395788e23259dad6ad56f11f88a 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -25,6 +25,8 @@ Document:
    show index from File;
 - Correct the Include syntax in the m4.xxx files in examples/conf
 - Document JobStatus and Termination codes.
+- Fix the error with the "DVI file can't be opened" while
+  building the French PDF.
 
 Priority:
 

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index 0ee91f8847305c9ff6ea7963245931f937615ef0..dc84a6594132cccf5a00b6fe8e7d80ac00a13010 100644 (file)
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -501,11 +501,9 @@ list_result(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type t
    send(ctx, "|");
    sql_field_seek(mdb, 0);
    for (i = 0; i < sql_num_fields(mdb); i++) {
-      char fmtbuf[50]; 
       Dmsg1(800, "list_result looking at field %d\n", i);
       field = sql_fetch_field(mdb);
-      bsnprintf(fmtbuf, sizeof(fmtbuf), "%%-%ds }", (int)field->max_length);
-      bsnprintf(buf, sizeof(buf), fmtbuf, field->name);
+      bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, field->name);
       send(ctx, buf);
    }
    send(ctx, "\n");

diff --git a/bacula/src/lib/bsnprintf.c b/bacula/src/lib/bsnprintf.c
index 77e320c9aed8ce4194baf5d2df150b3ea63a1cb5..4094e0028357aad9fc70e7c05cd1b27061f1c0eb 100644 (file)
--- a/bacula/src/lib/bsnprintf.c
+++ b/bacula/src/lib/bsnprintf.c
@@ -112,7 +112,6 @@ int bvsnprintf(char *buffer, int32_t maxlen, const char *format, va_list args)
    int cflags;
    int32_t currlen;
    int base;
-   int junk;
 #ifdef FP_OUTPUT
    LDOUBLE fvalue;
 #endif
@@ -168,11 +167,7 @@ int bvsnprintf(char *buffer, int32_t maxlen, const char *format, va_list args)
             min = 10 * min + char_to_int(ch);
             ch = *format++;
          } else if (ch == '*') {
-#ifdef SECURITY_PROBLEM
             min = va_arg(args, int);
-#else
-            junk = va_arg(args, int);
-#endif
             ch = *format++;
             state = DP_S_DOT;
          } else
@@ -193,11 +188,7 @@ int bvsnprintf(char *buffer, int32_t maxlen, const char *format, va_list args)
             max = 10 * max + char_to_int(ch);
             ch = *format++;
          } else if (ch == '*') {
-#ifdef SECURITY_PROBLEM
             max = va_arg(args, int);
-#else
-            junk = va_arg(args, int);
-#endif
             ch = *format++;
             state = DP_S_MOD;
          } else

diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index 90f8616c53a9c63fbc9da1ee52c36de430cb7d5f..8ac1fc27df5641a0796300f403b24c159d553479 100644 (file)
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -1,6 +1,8 @@
               Technical notes on version 1.39  
 
 General:
+05Aug06
+kes  Correct improperly formated list command output reported by Dan.
 04Aug06
 kes  Correct despool time calculation.
 03Aug06