Implement selecting another Volume if busy + cleanup spool messages

[bacula/bacula] / bacula / src / dird / ua.h

diff --git a/bacula/src/dird/ua.h b/bacula/src/dird/ua.h
index b5e28774e062857d5cb7ea1c61d6d18f8dae4a4a..d2ded609b44d59e11a1e754e5c6811375e75f8db 100644 (file)
--- a/bacula/src/dird/ua.h
+++ b/bacula/src/dird/ua.h
@@ -6,7 +6,7 @@
  *     Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -25,72 +25,40 @@
 
  */
 
-#define MAX_ARGS 30
+#ifndef __UA_H_
+#define __UA_H_ 1
 
-typedef struct s_ua_context {
+struct UAContext {
    BSOCK *UA_sock;
    BSOCK *sd;
    JCR *jcr;
    B_DB *db;
    CAT *catalog;
-   POOLMEM *cmd;                     /* return command/name buffer */
-   POOLMEM *args;                    /* command line arguments */
-   char *argk[MAX_ARGS];             /* argument keywords */
-   char *argv[MAX_ARGS];             /* argument values */
-   int argc;                         /* number of arguments */
-   char **prompt;                    /* list of prompts */
-   int max_prompts;                  /* max size of list */
-   int num_prompts;                  /* current number in list */
-   int auto_display_messages;        /* if set, display messages */
-   int user_notified_msg_pending;     /* set when user notified */
-   int automount;                    /* if set, mount after label */
-   int quit;                         /* if set, quit */
-   int verbose;                      /* set for normal UA verbosity */
-} UAContext;
+   CONRES *cons;                      /* console resource */
+   POOLMEM *cmd;                      /* return command/name buffer */
+   POOLMEM *args;                     /* command line arguments */
+   char *argk[MAX_CMD_ARGS];          /* argument keywords */
+   char *argv[MAX_CMD_ARGS];          /* argument values */
+   int argc;                          /* number of arguments */
+   char **prompt;                     /* list of prompts */
+   int max_prompts;                   /* max size of list */
+   int num_prompts;                   /* current number in list */
+   bool auto_display_messages;        /* if set, display messages */
+   bool user_notified_msg_pending;    /* set when user notified */
+   bool automount;                    /* if set, mount after label */
+   bool quit;                         /* if set, quit */
+   bool verbose;                      /* set for normal UA verbosity */
+   uint32_t pint32_val;               /* positive integer */
+   int32_t  int32_val;                /* positive/negative */
+};          
 
-/* ua_cmds.c */
-int do_a_command(UAContext *ua, char *cmd);
-int do_a_dot_command(UAContext *ua, char *cmd);
-int qmessagescmd(UAContext *ua, char *cmd);
-int open_db(UAContext *ua);
-void close_db(UAContext *ua);
+/* Context for insert_tree_handler() */
+struct TREE_CTX {
+   TREE_ROOT *root;                   /* root */
+   TREE_NODE *node;                   /* current node */
+   TREE_NODE *avail_node;             /* unused node last insert */
+   int cnt;                           /* count for user feedback */
+   UAContext *ua;
+};
 
-/* ua_input.c */
-char *next_arg(char **s);
-int get_cmd(UAContext *ua, char *prompt);
-void parse_command_args(UAContext *ua);
-
-/* ua_output.c */
-void prtit(void *ctx, char *msg);
-
-/* ua_server.c */
-void bsendmsg(void *sock, char *fmt, ...);
-
-/* ua_select.c */
-STORE  *select_storage_resource(UAContext *ua);
-JOB    *select_job_resource(UAContext *ua);
-JOB    *select_restore_job_resource(UAContext *ua);
-CLIENT *select_client_resource(UAContext *ua);
-FILESET *select_fs_resource(UAContext *ua);
-int    select_pool_and_media_dbr(UAContext *ua, POOL_DBR *pr, MEDIA_DBR *mr);
-int    select_pool_dbr(UAContext *ua, POOL_DBR *pr);
-
-void   start_prompt(UAContext *ua, char *msg);
-void   add_prompt(UAContext *ua, char *prompt);
-int    do_prompt(UAContext *ua, char *msg, char *prompt);
-CAT    *get_catalog_resource(UAContext *ua);          
-STORE  *get_storage_resource(UAContext *ua, char *cmd);
-int    get_media_type(UAContext *ua, char *MediaType);
-int    get_pool_dbr(UAContext *ua, POOL_DBR *pr);
-POOL   *get_pool_resource(UAContext *ua);
-CLIENT *get_client_resource(UAContext *ua);
-int    get_job_dbr(UAContext *ua, JOB_DBR *jr);
-
-int find_arg_keyword(UAContext *ua, char **list);
-int do_keyword_prompt(UAContext *ua, char *msg, char **list);
-int confirm_retention(UAContext *ua, btime_t *ret, char *msg);
-
-/* ua_prune.c */
-int prune_files(UAContext *ua, CLIENT *client);
-int prune_jobs(UAContext *ua, CLIENT *client, int JobType);
-int prune_volume(UAContext *ua, POOL_DBR *pr, MEDIA_DBR *mr);
+#endif