X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_output.c;h=a32fbe0243bccfd622a8ac526e649dc32784a55d;hb=5e70231c4ca1e035795a7e005faac68b7bb67391;hp=494120d07a130351936fcbe91948ae19712370dc;hpb=a67a0fc0804c92921068ab9ff916df094618899c;p=bacula%2Fbacula

diff --git a/bacula/src/dird/ua_output.c b/bacula/src/dird/ua_output.c
index 494120d07a..a32fbe0243 100644
--- a/bacula/src/dird/ua_output.c
+++ b/bacula/src/dird/ua_output.c
@@ -1,94 +1,123 @@
 /*
- *
- *   Bacula Director -- User Agent Output Commands
- *     I.e. messages, listing database, showing resources, ...
- *
- *     Kern Sibbald, September MM
- *
- *   Version $Id$
- */
+   Bacula® - The Network Backup Solution
 
-/*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   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 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
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ *
+ *   Bacula Director -- User Agent Output Commands
+ *     I.e. messages, listing database, showing resources, ...
+ *
+ *     Kern Sibbald, September MM
+ *
+ *   Version $Id$
  */
 
 #include "bacula.h"
 #include "dird.h"
-#include "ua.h"
 
 /* Imported subroutines */
-extern void run_job(JCR *jcr);
 
 /* Imported variables */
 extern int r_first;
 extern int r_last;
-extern struct s_res resources[];
-extern int console_msg_pending;
-extern FILE *con_fd;
-extern pthread_mutex_t con_mutex;
-
+extern RES_TABLE resources[];
+extern RES **res_head;
 
 /* Imported functions */
 
 /* Forward referenced functions */
-
+static int do_list_cmd(UAContext *ua, const char *cmd, e_list_type llist);
+static bool list_nextvol(UAContext *ua, int ndays);
 
 /*
  * Turn auto display of console messages on/off
  */
-int autodisplaycmd(UAContext *ua, char *cmd)
+int autodisplay_cmd(UAContext *ua, const char *cmd)
 {
-   static char *kw[] = {
-      N_("on"), 
-      N_("off"),
+   static const char *kw[] = {
+      NT_("on"),
+      NT_("off"),
       NULL};
 
    switch (find_arg_keyword(ua, kw)) {
-      case 0:
-	 ua->auto_display_messages = 1;
-	 break;
-      case 1:
-	 ua->auto_display_messages = 0;
-	 break;
-      default:
-         bsendmsg(ua, _("ON or OFF keyword missing.\n"));
-	 break;
+   case 0:
+      ua->auto_display_messages = true;
+      break;
+   case 1:
+      ua->auto_display_messages = false;
+      break;
+   default:
+      ua->error_msg(_("ON or OFF keyword missing.\n"));
+      break;
+   }
+   return 1;
+}
+
+/*
+ * Turn GUI mode on/off
+ */
+int gui_cmd(UAContext *ua, const char *cmd)
+{
+   static const char *kw[] = {
+      NT_("on"),
+      NT_("off"),
+      NULL};
+
+   switch (find_arg_keyword(ua, kw)) {
+   case 0:
+      ua->jcr->gui = ua->gui = true;
+      break;
+   case 1:
+      ua->jcr->gui = ua->gui = false;
+      break;
+   default:
+      ua->error_msg(_("ON or OFF keyword missing.\n"));
+      break;
    }
-   return 1; 
+   return 1;
 }
 
 
-struct showstruct {char *res_name; int type;};
+
+struct showstruct {const char *res_name; int type;};
 static struct showstruct reses[] = {
-   {N_("directors"),  R_DIRECTOR},
-   {N_("clients"),    R_CLIENT},
-   {N_("jobs"),       R_JOB},
-   {N_("storages"),   R_STORAGE},
-   {N_("catalogs"),   R_CATALOG},
-   {N_("schedules"),  R_SCHEDULE},
-   {N_("filesets"),   R_FILESET},
-   {N_("groups"),     R_GROUP},
-   {N_("pools"),      R_POOL},
-   {N_("messages"),   R_MSGS},
-   {N_("all"),        -1},
-   {N_("help"),       -2},
-   {NULL,	    0}
+   {NT_("directors"),  R_DIRECTOR},
+   {NT_("clients"),    R_CLIENT},
+   {NT_("counters"),   R_COUNTER},
+   {NT_("devices"),    R_DEVICE},
+   {NT_("jobs"),       R_JOB},
+   {NT_("storages"),   R_STORAGE},
+   {NT_("catalogs"),   R_CATALOG},
+   {NT_("schedules"),  R_SCHEDULE},
+   {NT_("filesets"),   R_FILESET},
+   {NT_("pools"),      R_POOL},
+   {NT_("messages"),   R_MSGS},
+   {NT_("all"),        -1},
+   {NT_("help"),       -2},
+   {NULL,           0}
 };
 
 
@@ -100,73 +129,77 @@ static struct showstruct reses[] = {
  *  show <resource-keyword-name>=<name> e.g. show director=HeadMan
  *
  */
-int showcmd(UAContext *ua, char *cmd)
+int show_cmd(UAContext *ua, const char *cmd)
 {
-   int i, j, type, len; 
+   int i, j, type, len;
    int recurse;
    char *res_name;
-   RES *res;
+   RES *res = NULL;
 
    Dmsg1(20, "show: %s\n", ua->UA_sock->msg);
 
 
+   LockRes();
    for (i=1; i<ua->argc; i++) {
       type = 0;
-      res_name = ua->argk[i]; 
-      if (!ua->argv[i]) {	      /* was a name given? */
-	 /* No name, dump all resources of specified type */
-	 recurse = 1;
-	 len = strlen(res_name);
-	 for (j=0; reses[j].res_name; j++) {
-	    if (strncasecmp(res_name, _(reses[j].res_name), len) == 0) {
-	       type = reses[j].type;
-	       if (type > 0) {
-		  res = resources[type-r_first].res_head;
-	       } else {
-		  res = NULL;
-	       }
-	       break;
-	    }
-	 }
+      res_name = ua->argk[i];
+      if (!ua->argv[i]) {             /* was a name given? */
+         /* No name, dump all resources of specified type */
+         recurse = 1;
+         len = strlen(res_name);
+         for (j=0; reses[j].res_name; j++) {
+            if (strncasecmp(res_name, _(reses[j].res_name), len) == 0) {
+               type = reses[j].type;
+               if (type > 0) {
+                  res = res_head[type-r_first];
+               } else {
+                  res = NULL;
+               }
+               break;
+            }
+         }
+
       } else {
-	 /* Dump a single resource with specified name */
-	 recurse = 0;
-	 len = strlen(res_name);
-	 for (j=0; reses[j].res_name; j++) {
-	    if (strncasecmp(res_name, _(reses[j].res_name), len) == 0) {
-	       type = reses[j].type;
-	       res = (RES *)GetResWithName(type, ua->argv[i]);
-	       if (!res) {
-		  type = -3;
-	       }
-	       break;
-	    }
-	 }
+         /* Dump a single resource with specified name */
+         recurse = 0;
+         len = strlen(res_name);
+         for (j=0; reses[j].res_name; j++) {
+            if (strncasecmp(res_name, _(reses[j].res_name), len) == 0) {
+               type = reses[j].type;
+               res = (RES *)GetResWithName(type, ua->argv[i]);
+               if (!res) {
+                  type = -3;
+               }
+               break;
+            }
+         }
       }
 
       switch (type) {
-      case -1:				 /* all */
-	 for (j=r_first; j<=r_last; j++) {
-	    dump_resource(j, resources[j-r_first].res_head, bsendmsg, ua);     
-	 }
-	 break;
+      case -1:                           /* all */
+         for (j=r_first; j<=r_last; j++) {
+            dump_resource(j, res_head[j-r_first], bsendmsg, ua);
+         }
+         break;
       case -2:
-         bsendmsg(ua, _("Keywords for the show command are:\n"));
-	 for (j=0; reses[j].res_name; j++) {
-            bsendmsg(ua, "%s\n", _(reses[j].res_name));
-	 }
-	 return 1;
+         ua->send_msg(_("Keywords for the show command are:\n"));
+         for (j=0; reses[j].res_name; j++) {
+            ua->error_msg("%s\n", _(reses[j].res_name));
+         }
+         goto bail_out;
       case -3:
-         bsendmsg(ua, _("%s resource %s not found.\n"), res_name, ua->argv[i]);
-	 return 1;
+         ua->error_msg(_("%s resource %s not found.\n"), res_name, ua->argv[i]);
+         goto bail_out;
       case 0:
-         bsendmsg(ua, _("Resource %s not found\n"), res_name);
-	 return 1;
+         ua->error_msg(_("Resource %s not found\n"), res_name);
+         goto bail_out;
       default:
-	 dump_resource(recurse?type:-type, res, bsendmsg, ua);
-	 break;
+         dump_resource(recurse?type:-type, res, bsendmsg, ua);
+         break;
       }
    }
+bail_out:
+   UnlockRes();
    return 1;
 }
 
@@ -176,19 +209,38 @@ int showcmd(UAContext *ua, char *cmd)
 /*
  *  List contents of database
  *
- *  list jobs		- lists all jobs run
- *  list jobid=nnn	- list job data for jobid
- *  list job=name	- list job data for job
+ *  list jobs           - lists all jobs run
+ *  list jobid=nnn      - list job data for jobid
+ *  list ujobid=uname   - list job data for unique jobid
+ *  list job=name       - list all jobs with "name"   
+ *  list jobname=name   - same as above 
  *  list jobmedia jobid=<nn>
  *  list jobmedia job=name
  *  list files jobid=<nn> - list files saved for job nn
  *  list files job=name
- *  list pools		- list pool records
- *  list jobtotals	- list totals for all jobs
- *  list media		- list media for given pool
+ *  list pools          - list pool records
+ *  list jobtotals      - list totals for all jobs
+ *  list media          - list media for given pool (deprecated)
+ *  list volumes        - list Volumes
+ *  list clients        - list clients
+ *  list nextvol job=xx  - list the next vol to be used by job
+ *  list nextvolume job=xx - same as above.
  *
  */
-int listcmd(UAContext *ua, char *cmd) 
+
+/* Do long or full listing */
+int llist_cmd(UAContext *ua, const char *cmd)
+{
+   return do_list_cmd(ua, cmd, VERT_LIST);
+}
+
+/* Do short or summary listing */
+int list_cmd(UAContext *ua, const char *cmd)
+{
+   return do_list_cmd(ua, cmd, HORZ_LIST);
+}
+
+static int do_list_cmd(UAContext *ua, const char *cmd, e_list_type llist)
 {
    POOLMEM *VolumeName;
    int jobid, n;
@@ -197,7 +249,7 @@ int listcmd(UAContext *ua, char *cmd)
    POOL_DBR pr;
    MEDIA_DBR mr;
 
-   if (!open_db(ua))
+   if (!open_client_db(ua))
       return 1;
 
    memset(&jr, 0, sizeof(jr));
@@ -207,142 +259,435 @@ int listcmd(UAContext *ua, char *cmd)
    Dmsg1(20, "list: %s\n", cmd);
 
    if (!ua->db) {
-      bsendmsg(ua, _("Hey! DB is NULL\n"));
+      ua->error_msg(_("Hey! DB is NULL\n"));
    }
 
    /* Scan arguments looking for things to do */
    for (i=1; i<ua->argc; i++) {
       /* List JOBS */
-      if (strcasecmp(ua->argk[i], _("jobs")) == 0) {
-	 db_list_job_records(ua->db, &jr, prtit, ua);
-
-	 /* List JOBTOTALS */
-      } else if (strcasecmp(ua->argk[i], _("jobtotals")) == 0) {
-	 db_list_job_totals(ua->db, &jr, prtit, ua);
-
-      /* List JOBID */
-      } else if (strcasecmp(ua->argk[i], _("jobid")) == 0) {
-	 if (ua->argv[i]) {
-	    jobid = atoi(ua->argv[i]);
-	    if (jobid > 0) {
-	       jr.JobId = jobid;
-	       db_list_job_records(ua->db, &jr, prtit, ua);
-	    }
-	 }
-
-      /* List JOB */
-      } else if (strcasecmp(ua->argk[i], _("job")) == 0 && ua->argv[i]) {
-	 strncpy(jr.Job, ua->argv[i], MAX_NAME_LENGTH);
-	 jr.Job[MAX_NAME_LENGTH-1] = 0;
-	 jr.JobId = 0;
-	 db_list_job_records(ua->db, &jr, prtit, ua);
+      if (strcasecmp(ua->argk[i], NT_("jobs")) == 0) {
+         /* Apply any limit */
+         j = find_arg_with_value(ua, NT_("limit"));
+         if (j >= 0) {
+            jr.limit = atoi(ua->argv[j]);
+         }
+         db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
+
+         /* List JOBTOTALS */
+      } else if (strcasecmp(ua->argk[i], NT_("jobtotals")) == 0) {
+         db_list_job_totals(ua->jcr, ua->db, &jr, prtit, ua);
+
+      /* List JOBID=nn */
+      } else if (strcasecmp(ua->argk[i], NT_("jobid")) == 0) {
+         if (ua->argv[i]) {
+            jobid = str_to_int64(ua->argv[i]);
+            if (jobid > 0) {
+               jr.JobId = jobid;
+               db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
+            }
+         }
+
+      /* List JOB=xxx */
+      } else if ((strcasecmp(ua->argk[i], NT_("job")) == 0 ||
+                  strcasecmp(ua->argk[i], NT_("jobname")) == 0) && ua->argv[i]) {
+         bstrncpy(jr.Name, ua->argv[i], MAX_NAME_LENGTH);
+         jr.JobId = 0;
+         db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
+
+      /* List UJOBID=xxx */
+      } else if (strcasecmp(ua->argk[i], NT_("ujobid")) == 0 && ua->argv[i]) {
+         bstrncpy(jr.Job, ua->argv[i], MAX_NAME_LENGTH);
+         jr.JobId = 0;
+         db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
 
       /* List FILES */
-      } else if (strcasecmp(ua->argk[i], _("files")) == 0) {
-
-	 for (j=i+1; j<ua->argc; j++) {
-            if (strcasecmp(ua->argk[j], _("job")) == 0 && ua->argv[j]) {
-	       strncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
-	       jr.Job[MAX_NAME_LENGTH-1] = 0;
-	       jr.JobId = 0;
-	       db_get_job_record(ua->db, &jr);
-	       jobid = jr.JobId;
-            } else if (strcasecmp(ua->argk[j], _("jobid")) == 0 && ua->argv[j]) {
-	       jobid = atoi(ua->argv[j]);
-	    } else {
-	       continue;
-	    }
-	    if (jobid > 0) {
-	       db_list_files_for_job(ua->db, jobid, prtit, ua);
-	    }
-	 }
-      
+      } else if (strcasecmp(ua->argk[i], NT_("files")) == 0) {
+
+         for (j=i+1; j<ua->argc; j++) {
+            if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
+               bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
+               jr.JobId = 0;
+               db_get_job_record(ua->jcr, ua->db, &jr);
+               jobid = jr.JobId;
+            } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
+               jobid = str_to_int64(ua->argv[j]);
+            } else {
+               continue;
+            }
+            if (jobid > 0) {
+               db_list_files_for_job(ua->jcr, ua->db, jobid, prtit, ua);
+            }
+         }
+
       /* List JOBMEDIA */
-      } else if (strcasecmp(ua->argk[i], _("jobmedia")) == 0) {
-	 int done = FALSE;
-	 for (j=i+1; j<ua->argc; j++) {
-            if (strcasecmp(ua->argk[j], _("job")) == 0 && ua->argv[j]) {
-	       strncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
-	       jr.Job[MAX_NAME_LENGTH-1] = 0;
-	       jr.JobId = 0;
-	       db_get_job_record(ua->db, &jr);
-	       jobid = jr.JobId;
-            } else if (strcasecmp(ua->argk[j], _("jobid")) == 0 && ua->argv[j]) {
-	       jobid = atoi(ua->argv[j]);
-	    } else {
-	       continue;
-	    }
-	    db_list_jobmedia_records(ua->db, jobid, prtit, ua);
-	    done = TRUE;
-	 }
-	 if (!done) {
-	    /* List for all jobs (jobid=0) */
-	    db_list_jobmedia_records(ua->db, 0, prtit, ua);
-	 }
+      } else if (strcasecmp(ua->argk[i], NT_("jobmedia")) == 0) {
+         int done = FALSE;
+         for (j=i+1; j<ua->argc; j++) {
+            if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
+               bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
+               jr.JobId = 0;
+               db_get_job_record(ua->jcr, ua->db, &jr);
+               jobid = jr.JobId;
+            } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
+               jobid = str_to_int64(ua->argv[j]);
+            } else {
+               continue;
+            }
+            db_list_jobmedia_records(ua->jcr, ua->db, jobid, prtit, ua, llist);
+            done = TRUE;
+         }
+         if (!done) {
+            /* List for all jobs (jobid=0) */
+            db_list_jobmedia_records(ua->jcr, ua->db, 0, prtit, ua, llist);
+         }
 
       /* List POOLS */
-      } else if (strcasecmp(ua->argk[i], _("pools")) == 0) {
-	 db_list_pool_records(ua->db, prtit, ua);
+      } else if (strcasecmp(ua->argk[i], NT_("pool")) == 0 ||
+                 strcasecmp(ua->argk[i], NT_("pools")) == 0) {
+         POOL_DBR pr;
+         memset(&pr, 0, sizeof(pr));
+         if (ua->argv[i]) {
+            bstrncpy(pr.Name, ua->argv[i], sizeof(pr.Name));
+         }
+         db_list_pool_records(ua->jcr, ua->db, &pr, prtit, ua, llist);
+
+      } else if (strcasecmp(ua->argk[i], NT_("clients")) == 0) {
+         db_list_client_records(ua->jcr, ua->db, prtit, ua, llist);
+
 
       /* List MEDIA or VOLUMES */
-      } else if (strcasecmp(ua->argk[i], _("media")) == 0 ||
-                 strcasecmp(ua->argk[i], _("volumes")) == 0) {
-	 int done = FALSE;
-	 for (j=i+1; j<ua->argc; j++) {
-            if (strcasecmp(ua->argk[j], _("job")) == 0 && ua->argv[j]) {
-	       strncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
-	       jr.Job[MAX_NAME_LENGTH-1] = 0;
-	       jr.JobId = 0;
-	       db_get_job_record(ua->db, &jr);
-	       jobid = jr.JobId;
-            } else if (strcasecmp(ua->argk[j], _("jobid")) == 0 && ua->argv[j]) {
-	       jobid = atoi(ua->argv[j]);
-	    } else {
-	       continue;
-	    }
-	    VolumeName = get_pool_memory(PM_FNAME);
-	    n = db_get_job_volume_names(ua->db, jobid, VolumeName);
-            bsendmsg(ua, _("Jobid %d used %d Volume(s): %s\n"), jobid, n, VolumeName);
-	    free_memory(VolumeName);
-	    done = TRUE;
-	 }
-	 /* if no job or jobid keyword found, then we list all media */
-	 if (!done) {
-	    if (!get_pool_dbr(ua, &pr)) {
-	       return 1;
-	    }
-	    mr.PoolId = pr.PoolId;
-	    db_list_media_records(ua->db, &mr, prtit, ua);
-	 }
+      } else if (strcasecmp(ua->argk[i], NT_("media")) == 0 ||
+                 strcasecmp(ua->argk[i], NT_("volume")) == 0 ||
+                 strcasecmp(ua->argk[i], NT_("volumes")) == 0) {
+         bool done = false;
+         for (j=i+1; j<ua->argc; j++) {
+            if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
+               bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
+               jr.JobId = 0;
+               db_get_job_record(ua->jcr, ua->db, &jr);
+               jobid = jr.JobId;
+            } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
+               jobid = str_to_int64(ua->argv[j]);
+            } else {
+               continue;
+            }
+            VolumeName = get_pool_memory(PM_FNAME);
+            n = db_get_job_volume_names(ua->jcr, ua->db, jobid, &VolumeName);
+            ua->send_msg(_("Jobid %d used %d Volume(s): %s\n"), jobid, n, VolumeName);
+            free_pool_memory(VolumeName);
+            done = true;
+         }
+         /* if no job or jobid keyword found, then we list all media */
+         if (!done) {
+            int num_pools;
+            uint32_t *ids;
+            /* List a specific volume? */
+            if (ua->argv[i]) {
+               bstrncpy(mr.VolumeName, ua->argv[i], sizeof(mr.VolumeName));
+               db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua, llist);
+               return 1;
+            }
+            /* Is a specific pool wanted? */
+            for (i=1; i<ua->argc; i++) {
+               if (strcasecmp(ua->argk[i], NT_("pool")) == 0) {
+                  if (!get_pool_dbr(ua, &pr)) {
+                     ua->error_msg(_("No Pool specified.\n"));
+                     return 1;
+                  }
+                  mr.PoolId = pr.PoolId;
+                  db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua, llist);
+                  return 1;
+               }
+            }
+
+            /* List Volumes in all pools */
+            if (!db_get_pool_ids(ua->jcr, ua->db, &num_pools, &ids)) {
+               ua->error_msg(_("Error obtaining pool ids. ERR=%s\n"),
+                        db_strerror(ua->db));
+               return 1;
+            }
+            if (num_pools <= 0) {
+               return 1;
+            }
+            for (i=0; i < num_pools; i++) {
+               pr.PoolId = ids[i];
+               if (db_get_pool_record(ua->jcr, ua->db, &pr)) {
+                  ua->send_msg(_("Pool: %s\n"), pr.Name);
+               }
+               mr.PoolId = ids[i];
+               db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua, llist);
+            }
+            free(ids);
+            return 1;
+         }
+      /* List next volume */
+      } else if (strcasecmp(ua->argk[i], NT_("nextvol")) == 0 ||
+                 strcasecmp(ua->argk[i], NT_("nextvolume")) == 0) {
+         n = 1;
+         j = find_arg_with_value(ua, NT_("days"));
+         if (j >= 0) {
+            n = atoi(ua->argv[j]);
+            if ((n < 0) || (n > 50)) {
+              ua->warning_msg(_("Ignoring invalid value for days. Max is 50.\n"));
+              n = 1;
+            }
+         }
+         list_nextvol(ua, n);
+      } else if (strcasecmp(ua->argk[i], NT_("limit")) == 0
+                 || strcasecmp(ua->argk[i], NT_("days")) == 0) {
+         /* Ignore it */
       } else {
-         bsendmsg(ua, _("Unknown list keyword: %s\n"), NPRT(ua->argk[i]));
+         ua->error_msg(_("Unknown list keyword: %s\n"), NPRT(ua->argk[i]));
       }
    }
    return 1;
 }
 
-void do_messages(UAContext *ua, char *cmd)
+static bool list_nextvol(UAContext *ua, int ndays)
+{
+   JOB *job;
+   JCR *jcr = ua->jcr;
+   USTORE store;
+   RUN *run;
+   time_t runtime;
+   bool found = false;
+   MEDIA_DBR mr;
+   POOL_DBR pr;
+
+   memset(&mr, 0, sizeof(mr));
+   int i = find_arg_with_value(ua, "job");
+   if (i <= 0) {
+      if ((job = select_job_resource(ua)) == NULL) {
+         return false;
+      }
+   } else {
+      job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
+      if (!job) {
+         Jmsg(jcr, M_ERROR, 0, _("%s is not a job name.\n"), ua->argv[i]);
+         if ((job = select_job_resource(ua)) == NULL) {
+            return false;
+         }
+      }
+   }
+   for (run=NULL; (run = find_next_run(run, job, runtime, ndays)); ) {
+      if (!complete_jcr_for_job(jcr, job, run->pool)) {
+         return false;
+      }
+      if (!jcr->jr.PoolId) {
+         ua->error_msg(_("Could not Pool Job %s\n"), job->name());
+         continue;
+      }
+      memset(&pr, 0, sizeof(pr));
+      pr.PoolId = jcr->jr.PoolId;
+      if (!db_get_pool_record(ua->jcr, ua->db, &pr)) {
+         bstrncpy(pr.Name, "*UnknownPool*", sizeof(pr.Name));
+      }
+      mr.PoolId = jcr->jr.PoolId;
+      get_job_storage(&store, job, run);
+      mr.StorageId = store.store->StorageId;
+      if (!find_next_volume_for_append(jcr, &mr, 1, fnv_no_create_vol, fnv_prune)) {
+         ua->error_msg(_("Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"),
+            job->name(), pr.Name, level_to_str(run->level));
+      } else {
+         ua->send_msg(
+            _("The next Volume to be used by Job \"%s\" (Pool=%s, Level=%s) will be %s\n"),
+            job->name(), pr.Name, level_to_str(run->level), mr.VolumeName);
+         found = true;
+      }
+      if (jcr->db && jcr->db != ua->db) {
+         db_close_database(jcr, jcr->db);
+         jcr->db = NULL;
+      }
+   }
+   if (!found) {
+      ua->error_msg(_("Could not find next Volume for Job %s.\n"),
+         job->hdr.name);
+      return false;
+   }
+   return true;
+}
+
+
+/*
+ * For a given job, we examine all his run records
+ *  to see if it is scheduled today or tomorrow.
+ */
+RUN *find_next_run(RUN *run, JOB *job, time_t &runtime, int ndays)
+{
+   time_t now, future, endtime;
+   SCHED *sched;
+   struct tm tm, runtm;
+   int mday, wday, month, wom, i;
+   int woy;
+   int day;
+   int is_scheduled;
+
+   sched = job->schedule;
+   if (sched == NULL) {            /* scheduled? */
+      return NULL;                 /* no nothing to report */
+   }
+
+   /* Break down the time into components */
+   now = time(NULL);
+   endtime = now + (ndays * 60 * 60 * 24);
+
+   if (run == NULL) {
+      run = sched->run;
+   } else {
+      run = run->next;
+   }
+   for ( ; run; run=run->next) {
+      /*
+       * Find runs in next 24 hours.  Day 0 is today, so if
+       *   ndays=1, look at today and tomorrow.
+       */
+      for (day = 0; day <= ndays; day++) {
+         future = now + (day * 60 * 60 * 24);
+
+         /* Break down the time into components */
+         (void)localtime_r(&future, &tm);
+         mday = tm.tm_mday - 1;
+         wday = tm.tm_wday;
+         month = tm.tm_mon;
+         wom = mday / 7;
+         woy = tm_woy(future);
+
+         is_scheduled = bit_is_set(mday, run->mday) && bit_is_set(wday, run->wday) &&
+            bit_is_set(month, run->month) && bit_is_set(wom, run->wom) &&
+            bit_is_set(woy, run->woy);
+ 
+#ifdef xxx
+         Pmsg2(000, "day=%d is_scheduled=%d\n", day, is_scheduled);
+         Pmsg1(000, "bit_set_mday=%d\n", bit_is_set(mday, run->mday));
+         Pmsg1(000, "bit_set_wday=%d\n", bit_is_set(wday, run->wday));
+         Pmsg1(000, "bit_set_month=%d\n", bit_is_set(month, run->month));
+         Pmsg1(000, "bit_set_wom=%d\n", bit_is_set(wom, run->wom));
+         Pmsg1(000, "bit_set_woy=%d\n", bit_is_set(woy, run->woy));
+#endif
+
+         if (is_scheduled) { /* Jobs scheduled on that day */
+#ifdef xxx
+            char buf[300], num[10];
+            bsnprintf(buf, sizeof(buf), "tm.hour=%d hour=", tm.tm_hour);
+            for (i=0; i<24; i++) {
+               if (bit_is_set(i, run->hour)) {
+                  bsnprintf(num, sizeof(num), "%d ", i);
+                  bstrncat(buf, num, sizeof(buf));
+               }
+            }
+            bstrncat(buf, "\n", sizeof(buf));
+            Pmsg1(000, "%s", buf);
+#endif
+            /* find time (time_t) job is to be run */
+            (void)localtime_r(&future, &runtm);
+            for (i= 0; i < 24; i++) {
+               if (bit_is_set(i, run->hour)) {
+                  runtm.tm_hour = i;
+                  runtm.tm_min = run->minute;
+                  runtm.tm_sec = 0;
+                  runtime = mktime(&runtm);
+                  Dmsg2(200, "now=%d runtime=%d\n", now, runtime);
+                  if ((runtime > now) && (runtime < endtime)) {
+                     Dmsg2(200, "Found it level=%d %c\n", run->level, run->level);
+                     return run;         /* found it, return run resource */
+                  }
+               }
+            }
+         }
+      }
+   } /* end for loop over runs */
+   /* Nothing found */
+   return NULL;
+}
+
+/*
+ * Fill in the remaining fields of the jcr as if it
+ *  is going to run the job.
+ */
+bool complete_jcr_for_job(JCR *jcr, JOB *job, POOL *pool)
+{
+   POOL_DBR pr;
+
+   memset(&pr, 0, sizeof(POOL_DBR));
+   set_jcr_defaults(jcr, job);
+   if (pool) {
+      jcr->pool = pool;               /* override */
+   }
+   if (jcr->db) {
+      Dmsg0(100, "complete_jcr close db\n");
+      db_close_database(jcr, jcr->db);
+      jcr->db = NULL;
+   }
+
+   Dmsg0(100, "complete_jcr open db\n");
+   jcr->db = jcr->db=db_init(jcr, jcr->catalog->db_driver, jcr->catalog->db_name, 
+                      jcr->catalog->db_user,
+                      jcr->catalog->db_password, jcr->catalog->db_address,
+                      jcr->catalog->db_port, jcr->catalog->db_socket,
+                      jcr->catalog->mult_db_connections);
+   if (!jcr->db || !db_open_database(jcr, jcr->db)) {
+      Jmsg(jcr, M_FATAL, 0, _("Could not open database \"%s\".\n"),
+                 jcr->catalog->db_name);
+      if (jcr->db) {
+         Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
+         db_close_database(jcr, jcr->db);
+         jcr->db = NULL;
+      }
+      return false;
+   }
+   bstrncpy(pr.Name, jcr->pool->name(), sizeof(pr.Name));
+   while (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */
+      /* Try to create the pool */
+      if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) {
+         Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name,
+            db_strerror(jcr->db));
+         if (jcr->db) {
+            db_close_database(jcr, jcr->db);
+            jcr->db = NULL;
+         }
+         return false;
+      } else {
+         Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name);
+      }
+   }
+   jcr->jr.PoolId = pr.PoolId;
+   return true;
+}
+
+
+static void con_lock_release(void *arg)
+{
+   Vw(con_lock);
+}
+
+void do_messages(UAContext *ua, const char *cmd)
 {
    char msg[2000];
-   int mlen; 
+   int mlen;
+   bool do_truncate = false;
 
-   P(con_mutex);
+   Pw(con_lock);
+   pthread_cleanup_push(con_lock_release, (void *)NULL);
    rewind(con_fd);
    while (fgets(msg, sizeof(msg), con_fd)) {
       mlen = strlen(msg);
       ua->UA_sock->msg = check_pool_memory_size(ua->UA_sock->msg, mlen+1);
       strcpy(ua->UA_sock->msg, msg);
       ua->UA_sock->msglen = mlen;
-      bnet_send(ua->UA_sock);
+      ua->UA_sock->send();
+      do_truncate = true;
+   }
+   if (do_truncate) {
+      (void)ftruncate(fileno(con_fd), 0L);
    }
-   ftruncate(fileno(con_fd), 0L);
    console_msg_pending = FALSE;
    ua->user_notified_msg_pending = FALSE;
-   V(con_mutex);
+   pthread_cleanup_pop(0);
+   Vw(con_lock);
 }
 
 
-int qmessagescmd(UAContext *ua, char *cmd)
+int qmessagescmd(UAContext *ua, const char *cmd)
 {
    if (console_msg_pending && ua->auto_display_messages) {
       do_messages(ua, cmd);
@@ -350,12 +695,12 @@ int qmessagescmd(UAContext *ua, char *cmd)
    return 1;
 }
 
-int messagescmd(UAContext *ua, char *cmd)
+int messagescmd(UAContext *ua, const char *cmd)
 {
    if (console_msg_pending) {
       do_messages(ua, cmd);
    } else {
-      bnet_fsend(ua->UA_sock, _("You have no messages.\n"));
+      ua->UA_sock->fsend(_("You have no messages.\n"));
    }
    return 1;
 }
@@ -363,50 +708,161 @@ int messagescmd(UAContext *ua, char *cmd)
 /*
  * Callback routine for "printing" database file listing
  */
-void prtit(void *ctx, char *msg)
+void prtit(void *ctx, const char *msg)
 {
    UAContext *ua = (UAContext *)ctx;
- 
-   bnet_fsend(ua->UA_sock, "%s", msg);
+
+   ua->UA_sock->fsend("%s", msg);
 }
 
-/* 
- * Format message and send to other end.  
+/*
+ * Format message and send to other end.
 
  * If the UA_sock is NULL, it means that there is no user
  * agent, so we are being called from Bacula core. In
  * that case direct the messages to the Job.
  */
-void bsendmsg(void *ctx, char *fmt, ...)
+#ifdef HAVE_VA_COPY
+void bmsg(UAContext *ua, const char *fmt, va_list arg_ptr)
 {
-   va_list arg_ptr;
-   UAContext *ua = (UAContext *)ctx;
    BSOCK *bs = ua->UA_sock;
    int maxlen, len;
-   POOLMEM *msg;
+   POOLMEM *msg = NULL;
+   va_list ap;
 
    if (bs) {
       msg = bs->msg;
-   } else {
+   }
+   if (!msg) {
       msg = get_pool_memory(PM_EMSG);
    }
 
 again:
    maxlen = sizeof_pool_memory(msg) - 1;
-   va_start(arg_ptr, fmt);
-   len = bvsnprintf(msg, maxlen, fmt, arg_ptr);
-   va_end(arg_ptr);
+   va_copy(ap, arg_ptr);
+   len = bvsnprintf(msg, maxlen, fmt, ap);
+   va_end(ap);
    if (len < 0 || len >= maxlen) {
-      msg = realloc_pool_memory(msg, maxlen + 200);
+      msg = realloc_pool_memory(msg, maxlen + maxlen/2);
       goto again;
    }
 
    if (bs) {
+      bs->msg = msg;
+      bs->msglen = len;
+      bs->send();
+   } else {                           /* No UA, send to Job */
+      Jmsg(ua->jcr, M_INFO, 0, "%s", msg);
+      free_pool_memory(msg);
+   }
+
+}
+
+#else /* no va_copy() -- brain damaged version of variable arguments */
+
+void bmsg(UAContext *ua, const char *fmt, va_list arg_ptr)
+{
+   BSOCK *bs = ua->UA_sock;
+   int maxlen, len;
+   POOLMEM *msg = NULL;
+
+   if (bs) {
+      msg = bs->msg;
+   }
+   if (!msg) {
+      msg = get_memory(5000);
+   }
+
+   maxlen = sizeof_pool_memory(msg) - 1;
+   if (maxlen < 4999) {
+      msg = realloc_pool_memory(msg, 5000);
+      maxlen = 4999;
+   }
+   len = bvsnprintf(msg, maxlen, fmt, arg_ptr);
+   if (len < 0 || len >= maxlen) {
+      pm_strcpy(msg, _("Message too long to display.\n"));
+      len = strlen(msg);
+   }
+
+   if (bs) {
+      bs->msg = msg;
       bs->msglen = len;
-      bnet_send(bs);
-   } else {			      /* No UA, send to Job */
-      Jmsg(ua->jcr, M_INFO, 0, msg);
+      bs->send();
+   } else {                           /* No UA, send to Job */
+      Jmsg(ua->jcr, M_INFO, 0, "%s", msg);
       free_pool_memory(msg);
    }
 
 }
+#endif
+ 
+void bsendmsg(void *ctx, const char *fmt, ...)
+{
+   va_list arg_ptr;
+   va_start(arg_ptr, fmt);
+   bmsg((UAContext *)ctx, fmt, arg_ptr);
+   va_end(arg_ptr);
+}
+
+/*
+ * The following UA methods are mainly intended for GUI
+ * programs
+ */
+/*
+ * This is a message that should be displayed on the user's 
+ *  console.
+ */
+void UAContext::send_msg(const char *fmt, ...)
+{
+   va_list arg_ptr;
+   va_start(arg_ptr, fmt);
+   bmsg(this, fmt, arg_ptr);
+   va_end(arg_ptr);
+}
+
+
+/*
+ * This is an error condition with a command. The gui should put
+ *  up an error or critical dialog box.  The command is aborted.
+ */
+void UAContext::error_msg(const char *fmt, ...)
+{
+   BSOCK *bs = UA_sock;
+   va_list arg_ptr;
+
+   if (bs && api) bs->signal(BNET_ERROR_MSG);
+   va_start(arg_ptr, fmt);
+   bmsg(this, fmt, arg_ptr);
+   va_end(arg_ptr);
+}
+
+/*  
+ * This is a warning message, that should bring up a warning
+ *  dialog box on the GUI. The command is not aborted, but something
+ *  went wrong.
+ */
+void UAContext::warning_msg(const char *fmt, ...)
+{
+   BSOCK *bs = UA_sock;
+   va_list arg_ptr;
+
+   if (bs && api) bs->signal(BNET_WARNING_MSG);
+   va_start(arg_ptr, fmt);
+   bmsg(this, fmt, arg_ptr);
+   va_end(arg_ptr);
+}
+
+/* 
+ * This is an information message that should probably be put
+ *  into the status line of a GUI program.
+ */
+void UAContext::info_msg(const char *fmt, ...)
+{
+   BSOCK *bs = UA_sock;
+   va_list arg_ptr;
+
+   if (bs && api) bs->signal(BNET_INFO_MSG);
+   va_start(arg_ptr, fmt);
+   bmsg(this, fmt, arg_ptr);
+   va_end(arg_ptr);
+}