new devel_bacula + fixes to conio/console

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

diff --git a/bacula/src/cats/sqlite.c b/bacula/src/cats/sqlite.c
index 007ddfc9aa5e5aacf0a570e89f902055ddc0ef1b..92e7338ba2b4e140d294aa1ea7d9ecbaecb5cd66 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, 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, 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;
 
@@ -88,7 +89,6 @@ db_init_database(void *jcr, char *db_name, char *db_user, char *db_password)
    mdb->path = get_pool_memory(PM_FNAME);
    mdb->esc_name = get_pool_memory(PM_FNAME);
    qinsert(&db_list, &mdb->bq);           /* put db in list */
-   mdb->jcr = jcr;
    V(mutex);
    return mdb;
 }
@@ -98,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(B_DB *mdb)
+db_open_database(JCR *jcr, B_DB *mdb)
 {
    char *db_name;
    int len;
@@ -148,7 +148,7 @@ db_open_database(B_DB *mdb)
       return 0;
    }
    free(db_name);
-   if (!check_tables_version(mdb)) {
+   if (!check_tables_version(jcr, mdb)) {
       V(mutex);
       return 0;
    }
@@ -159,7 +159,7 @@ db_open_database(B_DB *mdb)
 }
 
 void
-db_close_database(B_DB *mdb)
+db_close_database(JCR *jcr, B_DB *mdb)
 {
    P(mutex);
    mdb->ref_count--;
@@ -187,7 +187,7 @@ db_close_database(B_DB *mdb)
  * Return the next unique index (auto-increment) for
  * the given table.  Return 0 on error.
  */
-int db_next_index(B_DB *mdb, char *table, char *index)
+int db_next_index(JCR *jcr, B_DB *mdb, char *table, char *index)
 {
    SQL_ROW row;
 
@@ -195,7 +195,7 @@ int db_next_index(B_DB *mdb, char *table, char *index)
 
    Mmsg(&mdb->cmd,
 "SELECT id FROM NextId WHERE TableName=\"%s\"", table);
-   if (!QUERY_DB(mdb, mdb->cmd)) {
+   if (!QUERY_DB(jcr, mdb, mdb->cmd)) {
       Mmsg(&mdb->errmsg, _("next_index query error: ERR=%s\n"), sql_strerror(mdb));
       db_unlock(mdb);
       return 0;
@@ -210,7 +210,7 @@ int db_next_index(B_DB *mdb, char *table, char *index)
 
    Mmsg(&mdb->cmd,
 "UPDATE NextId SET id=id+1 WHERE TableName=\"%s\"", table);
-   if (!QUERY_DB(mdb, mdb->cmd)) {
+   if (!QUERY_DB(jcr, mdb, mdb->cmd)) {
       Mmsg(&mdb->errmsg, _("next_index update error: ERR=%s\n"), sql_strerror(mdb));
       db_unlock(mdb);
       return 0;
@@ -226,7 +226,7 @@ int db_next_index(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
@@ -329,7 +329,7 @@ SQL_ROW my_sqlite_fetch_row(B_DB *mdb)
 
 void my_sqlite_free_table(B_DB *mdb)
 {
-   unsigned int i;
+   int i;
 
    if (mdb->fields_defined) {
       for (i=0; i < sql_num_fields(mdb); i++) {
@@ -344,7 +344,7 @@ void my_sqlite_free_table(B_DB *mdb)
 
 void my_sqlite_field_seek(B_DB *mdb, int field)
 {
-   unsigned int i, j;
+   int i, j;
    if (mdb->result == NULL) {
       return;
    }
@@ -356,8 +356,8 @@ void my_sqlite_field_seek(B_DB *mdb, int field)
         mdb->fields[i]->name = mdb->result[i];
         mdb->fields[i]->length = strlen(mdb->fields[i]->name);
         mdb->fields[i]->max_length = mdb->fields[i]->length;
-        for (j=1; j <= (unsigned)mdb->nrow; j++) {
-           uint32_t len;
+        for (j=1; j <= mdb->nrow; j++) {
+           int len;
            if (mdb->result[i + mdb->ncolumn *j]) {
               len = (uint32_t)strlen(mdb->result[i + mdb->ncolumn * j]);
            } else {
@@ -372,8 +372,8 @@ void my_sqlite_field_seek(B_DB *mdb, int field)
       }
       mdb->fields_defined = TRUE;
    }
-   if (field > (int)sql_num_fields(mdb)) {
-      field = (int)sql_num_fields(mdb);
+   if (field > sql_num_fields(mdb)) {
+      field = sql_num_fields(mdb);
     }
     mdb->field = field;
 
@@ -384,80 +384,6 @@ SQL_FIELD *my_sqlite_fetch_field(B_DB *mdb)
    return mdb->fields[mdb->field++];
 }
 
-static void
-list_dashes(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
-{
-   SQL_FIELD *field;
-   unsigned int i, j;
-
-   sql_field_seek(mdb, 0);
-   send(ctx, "+");
-   for (i = 0; i < sql_num_fields(mdb); i++) {
-      field = sql_fetch_field(mdb);
-      for (j = 0; j < field->max_length + 2; j++)
-              send(ctx, "-");
-      send(ctx, "+");
-   }
-   send(ctx, "\n");
-}
-
-void
-list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
-{
-   SQL_FIELD *field;
-   SQL_ROW row;
-   unsigned int i, col_len;
-   char buf[2000], ewc[30];
-
-   if (mdb->result == NULL || mdb->nrow == 0) {
-      send(ctx, _("No results to list.\n"));
-      return;
-   }
-   /* determine column display widths */
-   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 */
-   }
-
-   list_dashes(mdb, send, ctx);
-   send(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);
-      send(ctx, buf);
-   }
-   send(ctx, "\n");
-   list_dashes(mdb, send, ctx);
-
-   while ((row = sql_fetch_row(mdb)) != NULL) {
-      sql_field_seek(mdb, 0);
-      send(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");
-        } else if (IS_NUM(field->type)) {
-            sprintf(buf, " %*s |", field->max_length,       
-              add_commas(row[i], ewc));
-        } else {
-            sprintf(buf, " %-*s |", field->max_length, row[i]);
-        }
-        send(ctx, buf);
-      }
-      send(ctx, "\n");
-   }
-   list_dashes(mdb, send, ctx);
-}
 
 
 #endif /* HAVE_SQLITE */