Additional message plus exclusion fix

[bacula/bacula] / bacula / src / stored / protos.h

diff --git a/bacula/src/stored/protos.h b/bacula/src/stored/protos.h
index 95eb7e6b330e829906cb021742325154e87ae6e2..6f0b4db6ff706138c63f6e916c017c5540f4e106 100644 (file)
--- a/bacula/src/stored/protos.h
+++ b/bacula/src/stored/protos.h
@@ -5,7 +5,7 @@
  */
 
 /*
-   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
@@ -27,15 +27,20 @@
 /* From stored.c */
 uint32_t new_VolSessionId();
 
+/* From acquire.c */
+DEVICE  *acquire_device_for_append(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
+int      acquire_device_for_read(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
+int      release_device(JCR *jcr, DEVICE *dev);
+
 /* From askdir.c */
-int     dir_get_volume_info(JCR *jcr);
+int     dir_get_volume_info(JCR *jcr, int writing);
 int     dir_find_next_appendable_volume(JCR *jcr);
 int     dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel);
 int     dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev);
 int     dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev);
 int     dir_update_file_attributes(JCR *jcr, DEV_RECORD *rec);
 int     dir_send_job_status(JCR *jcr);
-int     dir_create_job_media_record(JCR *jcr);
+int     dir_create_jobmedia_record(JCR *jcr);
 
 /* authenticate.c */
 int     authenticate_director(JCR *jcr);
@@ -48,13 +53,20 @@ void    init_block_write(DEV_BLOCK *block);
 void    empty_block(DEV_BLOCK *block);
 void    free_block(DEV_BLOCK *block);
 int     write_block_to_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
-int     write_block_to_dev(DEVICE *dev, DEV_BLOCK *block);
+int     write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
 int     read_block_from_device(DEVICE *dev, DEV_BLOCK *block);
 int     read_block_from_dev(DEVICE *dev, DEV_BLOCK *block);
 
+/* From butil.c -- utilities for SD tool programs */
+void    print_ls_output(char *fname, char *link, int type, struct stat *statp);
+JCR    *setup_jcr(char *name, char *device, BSR *bsr); 
+DEVICE *setup_to_access_device(JCR *jcr, int read_access);
+void    display_error_status(DEVICE *dev);
+DEVRES *find_device_res(char *device_name, int read_access);
+
 
 /* From dev.c */
-DEVICE  *init_dev(DEVICE *dev, char *device);
+DEVICE  *init_dev(DEVICE *dev, DEVRES *device);
 int      open_dev(DEVICE *dev, char *VolName, int mode);
 void     close_dev(DEVICE *dev);
 void     force_close_dev(DEVICE *dev);
@@ -77,6 +89,10 @@ int      fsf_dev(DEVICE *dev, int num);
 int      fsr_dev(DEVICE *dev, int num);
 int      bsf_dev(DEVICE *dev, int num);
 int      bsr_dev(DEVICE *dev, int num);
+void     attach_jcr_to_device(DEVICE *dev, JCR *jcr);
+void     detach_jcr_from_device(DEVICE *dev, JCR *jcr);
+JCR     *next_attached_jcr(DEVICE *dev, JCR *jcr);
+
 
 /* Get info about device */
 char *   dev_name(DEVICE *dev);
@@ -87,15 +103,20 @@ int      dev_is_tape(DEVICE *dev);
 
 /* From device.c */
 int      open_device(DEVICE *dev);
-int      acquire_device_for_append(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
-int      acquire_device_for_read(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
-int      ready_dev_for_read(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
-int      release_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
-void     block_device(DEVICE *dev, int state);
-void     unblock_device(DEVICE *dev);
-void     lock_device(DEVICE *dev);
-void     unlock_device(DEVICE *dev);
 int      fixup_device_block_write_error(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
+void _lock_device(char *file, int line, DEVICE *dev);
+void _unlock_device(char *file, int line, DEVICE *dev);
+void _block_device(char *file, int line, DEVICE *dev, int state);
+void _unblock_device(char *file, int line, DEVICE *dev);
+void _steal_device_lock(char *file, int line, DEVICE *dev, bsteal_lock_t *hold, int state);
+void _return_device_lock(char *file, int line, DEVICE *dev, bsteal_lock_t *hold);
+
+/* don't use */
+void _new_lock_device(char *file, int line, DEVICE *dev);
+void _new_lock_device(char *file, int line, DEVICE *dev, int state);
+void _new_unlock_device(char *file, int line, DEVICE *dev);
+void  new_steal_device_lock(DEVICE *dev, brwsteal_t *hold, int state);
+void  new_return_device_lock(DEVICE *dev, brwsteal_t *hold);
 
 /* From dircmd.c */
 void     connection_request(void *arg); 
@@ -115,6 +136,7 @@ void     handle_filed_connection(BSOCK *fd, char *job_name);
 /* From label.c */
 int      read_dev_volume_label(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
 void     create_session_label(JCR *jcr, DEV_RECORD *rec, int label);
+void     create_volume_label(DEVICE *dev, char *VolName);
 int      write_volume_label_to_dev(JCR *jcr, DEVRES *device, char *VolName, char *PoolName);
 int      write_session_label(JCR *jcr, DEV_BLOCK *block, int label);
 int      write_volume_label_to_block(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
@@ -127,6 +149,12 @@ int      unser_session_label(SESSION_LABEL *label, DEV_RECORD *rec);
 int match_bsr(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec, 
               SESSION_LABEL *sesrec);
 
+/* From mount.c */
+int      mount_next_write_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, int release);
+int      mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
+int      autoload_device(JCR *jcr, DEVICE *dev, int writing, BSOCK *dir);
+
+
 /* From parse_bsr.c */
 extern BSR *parse_bsr(JCR *jcr, char *lf);
 extern void dump_bsr(BSR *bsr);
@@ -138,10 +166,14 @@ extern void create_vol_list(JCR *jcr);
 
 /* From record.c */
 char   *FI_to_ascii(int fi);
-char   *stream_to_ascii(int stream);
+char   *stream_to_ascii(int stream, int fi);
 int     write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec);
+int     can_write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec);
 int     read_record_from_block(DEV_BLOCK *block, DEV_RECORD *rec); 
 DEV_RECORD *new_record();
 void    free_record(DEV_RECORD *rec);
-int     read_record(DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *record);
-int     write_record_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *record);
+
+/* From read_record.c */
+int read_records(JCR *jcr,  DEVICE *dev, 
+       void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec),
+       int mount_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block));