Fix and document new queries

[bacula/bacula] / bacula / src / dird / ua_query.c

diff --git a/bacula/src/dird/ua_query.c b/bacula/src/dird/ua_query.c
index 4cac6c2ea2e137ff66aed2c98f9458c7935b3331..019666b1f245a9185c3b50c72c3f75dfa8df1d3f 100644 (file)
--- a/bacula/src/dird/ua_query.c
+++ b/bacula/src/dird/ua_query.c
@@ -15,8 +15,8 @@
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,7 +28,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -69,8 +69,9 @@ int querycmd(UAContext *ua, const char *cmd)
       goto bail_out;
    }
    if ((fd=fopen(query_file, "rb")) == NULL) {
-      bsendmsg(ua, _("Could not open %s: ERR=%s\n"), query_file,
-         strerror(errno));
+      berrno be;
+      ua->error_msg(_("Could not open %s: ERR=%s\n"), query_file,
+         be.bstrerror());
       goto bail_out;
    }
 
@@ -95,7 +96,7 @@ int querycmd(UAContext *ua, const char *cmd)
       }
    }
    if (i != item) {
-      bsendmsg(ua, _("Could not find query.\n"));
+      ua->error_msg(_("Could not find query.\n"));
       goto bail_out;
    }
    query[0] = 0;
@@ -113,7 +114,7 @@ int querycmd(UAContext *ua, const char *cmd)
       len = strlen(line);
       if (line[0] == '*') {            /* prompt */
          if (nprompt >= 9) {
-            bsendmsg(ua, _("Too many prompts in query, max is 9.\n"));
+            ua->error_msg(_("Too many prompts in query, max is 9.\n"));
          } else {
             line[len++] = ' ';
             line[len] = 0;
@@ -135,7 +136,7 @@ int querycmd(UAContext *ua, const char *cmd)
          if (query[0] == '!') {
             db_list_sql_query(ua->jcr, ua->db, query+1, prtit, ua, 0, VERT_LIST);
          } else if (!db_list_sql_query(ua->jcr, ua->db, query, prtit, ua, 1, HORZ_LIST)) {
-            bsendmsg(ua, "%s\n", query);
+            ua->send_msg("%s\n", query);
          }
          query[0] = 0;
       }
@@ -147,7 +148,7 @@ int querycmd(UAContext *ua, const char *cmd)
          if (query[0] == '!') {
             db_list_sql_query(ua->jcr, ua->db, query+1, prtit, ua, 0, VERT_LIST);
          } else if (!db_list_sql_query(ua->jcr, ua->db, query, prtit, ua, 1, HORZ_LIST)) {
-            bsendmsg(ua, "%s\n", query);
+            ua->error_msg("%s\n", query);
          }
    }
 
@@ -207,7 +208,7 @@ static POOLMEM *substitute_prompts(UAContext *ua,
                }
                len = strlen(ua->cmd);
                p = (char *)malloc(len * 2 + 1);
-               db_escape_string(p, ua->cmd, len);
+               db_escape_string(ua->jcr, ua->db, p, ua->cmd, len);
                subst[n] = p;
                olen = o - new_query;
                new_query = check_pool_memory_size(new_query, olen + strlen(p) + 10);
@@ -216,7 +217,7 @@ static POOLMEM *substitute_prompts(UAContext *ua,
                   *o++ = *p++;
                }
             } else {
-               bsendmsg(ua, _("Warning prompt %d missing.\n"), n+1);
+               ua->error_msg(_("Warning prompt %d missing.\n"), n+1);
             }
             q += 2;
             break;
@@ -261,7 +262,7 @@ int sqlquerycmd(UAContext *ua, const char *cmd)
    }
    *query.c_str() = 0;
 
-   bsendmsg(ua, _("Entering SQL query mode.\n"
+   ua->send_msg(_("Entering SQL query mode.\n"
 "Terminate each query with a semicolon.\n"
 "Terminate query mode with a blank line.\n"));
    msg = _("Enter SQL query: ");
@@ -285,6 +286,6 @@ int sqlquerycmd(UAContext *ua, const char *cmd)
          msg = _("Add to SQL query: ");
       }
    }
-   bsendmsg(ua, _("End query mode.\n"));
+   ua->send_msg(_("End query mode.\n"));
    return 1;
 }