Fix DiskToCatalog seg fault

[bacula/bacula] / bacula / src / cats / sqlite.c

diff --git a/bacula/src/cats/sqlite.c b/bacula/src/cats/sqlite.c
index 18cf9128a36c1766e1474c3d04589348ab92ca9c..754ae338558272ff08dc96c64f264bac6d8e43e9 100644 (file)
--- a/bacula/src/cats/sqlite.c
+++ b/bacula/src/cats/sqlite.c
@@ -51,7 +51,7 @@ static BQUEUE db_list = {&db_list, &db_list};
 
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
-int QueryDB(char *file, int line, void *jcr, B_DB *db, char *select_cmd);
+int QueryDB(char *file, int line, JCR *jcr, B_DB *db, char *select_cmd);
 
 
 /*
@@ -59,7 +59,8 @@ int QueryDB(char *file, int line, void *jcr, B_DB *db, char *select_cmd);
  * never have errors, or it is really fatal.
  */
 B_DB *
-db_init_database(void *jcr, char *db_name, char *db_user, char *db_password)
+db_init_database(JCR *jcr, char *db_name, char *db_user, char *db_password,
+                char *db_address, int db_port, char *db_socket) 
 {
    B_DB *mdb;
 
@@ -97,7 +98,7 @@ db_init_database(void *jcr, char *db_name, char *db_user, char *db_password)
  * which are returned in the errmsg
  */
 int
-db_open_database(void *jcr, B_DB *mdb)
+db_open_database(JCR *jcr, B_DB *mdb)
 {
    char *db_name;
    int len;
@@ -158,7 +159,7 @@ db_open_database(void *jcr, B_DB *mdb)
 }
 
 void
-db_close_database(void *jcr, B_DB *mdb)
+db_close_database(JCR *jcr, B_DB *mdb)
 {
    P(mutex);
    mdb->ref_count--;
@@ -186,7 +187,7 @@ db_close_database(void *jcr, B_DB *mdb)
  * Return the next unique index (auto-increment) for
  * the given table.  Return 0 on error.
  */
-int db_next_index(void *jcr, B_DB *mdb, char *table, char *index)
+int db_next_index(JCR *jcr, B_DB *mdb, char *table, char *index)
 {
    SQL_ROW row;
 
@@ -225,7 +226,7 @@ int db_next_index(void *jcr, B_DB *mdb, char *table, char *index)
  * Escape strings so that SQLite is happy
  *
  *   NOTE! len is the length of the old string. Your new
- *        string must be long enough (max 2*old) to hold
+ *        string must be long enough (max 2*old+1) to hold
  *        the escaped output.
  */
 void
@@ -400,12 +401,16 @@ list_dashes(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
    send(ctx, "\n");
 }
 
+/*
+ * If full_list is set, we list vertically, otherwise, we 
+ * list on one line horizontally.      
+ */
 void
-list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
+list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
 {
    SQL_FIELD *field;
    SQL_ROW row;
-   unsigned int i, col_len;
+   unsigned int i, col_len, max_len = 0;
    char buf[2000], ewc[30];
 
    if (mdb->result == NULL || mdb->nrow == 0) {
@@ -416,15 +421,27 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
    sql_field_seek(mdb, 0);
    for (i = 0; i < sql_num_fields(mdb); i++) {
       field = sql_fetch_field(mdb);
-      if (IS_NUM(field->type) && field->max_length > 0) { /* fixup for commas */
-        field->max_length += (field->max_length - 1) / 3;
-      }
       col_len = strlen(field->name);
-      if (col_len < field->max_length)
-             col_len = field->max_length;
-      if (col_len < 4 && !IS_NOT_NULL(field->flags))
-              col_len = 4;    /* 4 = length of the word "NULL" */
-      field->max_length = col_len;    /* reset column info */
+      if (type == VERT_LIST) {
+        if (col_len > max_len) {
+           max_len = col_len;
+        }
+      } else {
+        if (IS_NUM(field->type) && field->max_length > 0) { /* fixup for commas */
+           field->max_length += (field->max_length - 1) / 3;
+        }
+        if (col_len < field->max_length) {
+           col_len = field->max_length;
+        }
+        if (col_len < 4 && !IS_NOT_NULL(field->flags)) {
+            col_len = 4;                 /* 4 = length of the word "NULL" */
+        }
+        field->max_length = col_len;    /* reset column info */
+      }
+   }
+
+   if (type == VERT_LIST) {
+      goto vertical_list;
    }
 
    list_dashes(mdb, send, ctx);
@@ -432,7 +449,7 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
    sql_field_seek(mdb, 0);
    for (i = 0; i < sql_num_fields(mdb); i++) {
       field = sql_fetch_field(mdb);
-      sprintf(buf, " %-*s |", field->max_length, field->name);
+      bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, field->name);
       send(ctx, buf);
    }
    send(ctx, "\n");
@@ -444,18 +461,39 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
       for (i = 0; i < sql_num_fields(mdb); i++) {
         field = sql_fetch_field(mdb);
         if (row[i] == NULL) {
-            sprintf(buf, " %-*s |", field->max_length, "NULL");
+            bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, "NULL");
         } else if (IS_NUM(field->type)) {
-            sprintf(buf, " %*s |", field->max_length,       
+            bsnprintf(buf, sizeof(buf), " %*s |", (int)field->max_length,       
               add_commas(row[i], ewc));
         } else {
-            sprintf(buf, " %-*s |", field->max_length, row[i]);
+            bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, row[i]);
         }
         send(ctx, buf);
       }
       send(ctx, "\n");
    }
    list_dashes(mdb, send, ctx);
+   return;
+
+vertical_list:
+   
+   while ((row = sql_fetch_row(mdb)) != NULL) {
+      sql_field_seek(mdb, 0);
+      for (i = 0; i < sql_num_fields(mdb); i++) {
+        field = sql_fetch_field(mdb);
+        if (row[i] == NULL) {
+            bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, "NULL");
+        } else if (IS_NUM(field->type)) {
+            bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, 
+              add_commas(row[i], ewc));
+        } else {
+            bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, row[i]);
+        }
+        send(ctx, buf);
+      }
+      send(ctx, "\n");
+   }
+   return;
 }