Imported Upstream version 2.6.1

[debian/amanda] / server-src / server_util.h

diff --git a/server-src/server_util.h b/server-src/server_util.h
index 601525ff54d5e28e5605da2e36d3c29ca109ff1b..ffab5eab294eacd2f1301128a58986eb2aa24a62 100644 (file)
--- a/server-src/server_util.h
+++ b/server-src/server_util.h
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: server_util.h,v 1.11.2.1 2006/11/24 18:05:07 martinea Exp $
+ * $Id: server_util.h,v 1.11 2006/05/25 01:47:20 johnfranks Exp $
  *
  */
 #ifndef SERVER_UTIL_H
@@ -45,32 +45,49 @@ enum {
     START, FILE_DUMP, PORT_DUMP, CONTINUE, ABORT,      /* dumper cmds */
     FAILED, TRYAGAIN, NO_ROOM, RQ_MORE_DISK,           /* dumper results */
     ABORT_FINISHED, BAD_COMMAND,                       /* dumper results */
-    START_TAPER, FILE_WRITE, PORT_WRITE,               /* taper cmds */
-    PORT, TAPE_ERROR, TAPER_OK,        SPLIT_NEEDNEXT,         /* taper results */
-    SPLIT_CONTINUE,
+    START_TAPER, FILE_WRITE, NEW_TAPE, NO_NEW_TAPE,     /* taper... */
+    PARTDONE, PORT_WRITE, DUMPER_STATUS,                /* ... cmds */
+    PORT, TAPE_ERROR, TAPER_OK,                                /* taper results */
+    REQUEST_NEW_TAPE,
     LAST_TOK
 };
 extern const char *cmdstr[];
 
 struct cmdargs {
+    cmd_t cmd;
     int argc;
-    char *argv[MAX_ARGS + 1];
+    char **argv;
 };
 
-cmd_t getcmd(struct cmdargs *cmdargs);
-cmd_t getresult(int fd, int show, int *result_argc, char **result_argv, int max_arg);
-void putresult(cmd_t result, const char *, ...)
-     __attribute__ ((format (printf, 2, 3)));
+struct cmdargs *getcmd(void);
+struct cmdargs *get_pending_cmd(void);
+void free_cmdargs(struct cmdargs *cmdargs);
+void putresult(cmd_t result, const char *, ...) G_GNUC_PRINTF(2, 3);
 int taper_cmd(cmd_t cmd, void *ptr, char *destname, int level, char *datestamp);
 
 struct disk_s;
 struct chunker_s;
-int chunker_cmd(struct chunker_s *chunker, cmd_t cmd, struct disk_s *dp);
+int chunker_cmd(struct chunker_s *chunker, cmd_t cmd, struct disk_s *dp,
+               char *mesg);
 
 struct dumper_s;
-int dumper_cmd(struct dumper_s *dumper, cmd_t cmd, struct disk_s *dp);
+int dumper_cmd(struct dumper_s *dumper, cmd_t cmd, struct disk_s *dp,
+              char *mesg);
 
 char *amhost_get_security_conf(char *string, void *arg);
 int check_infofile(char *infodir, disklist_t *dl, char **errmsg);
 
+void run_server_script(pp_script_t  *pp_script,
+                      execute_on_t  execute_on,
+                      char         *config,
+                      disk_t       *dp,
+                      int           level);
+void run_server_scripts(execute_on_t  execute_on,
+                       char         *config,
+                       disk_t       *dp,
+                       int           level);
+
+void run_amcleanup(char *config_name);
+char *get_master_process(char *logfile);
+
 #endif /* SERVER_UTIL_H */