Changeset 1645 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-stream.c

Timestamp:

Sep 24, 2007, 3:04:43 AM (17 years ago)

Author:

Bruno Cornec

Message:

Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
Should solve the tmpdir issue from previous rev.
May still not compile

File:

• branches/2.2.5/mondo/src/common/libmondo-stream.c (modified) (28 diffs)

branches/2.2.5/mondo/src/common/libmondo-stream.c

@@ -120 +120 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 /**
  * @addtogroup globalGroup
@@ -150 +153 @@
 /* @} - end of globalGroup */
 
-int write_backcatalog_to_tape(struct s_bkpinfo *bkpinfo);
+int write_backcatalog_to_tape();
 
 
@@ -167 +170 @@
  * @note This should be called by restore processes only.
  */
-int closein_cdstream(struct s_bkpinfo *bkpinfo)
-{
-    return (closein_tape(bkpinfo));
+int closein_cdstream()
+{
+    return (closein_tape());
 }
 
@@ -182 +185 @@
  * @bug @p bkpinfo parameter is unused.
  */
-int closein_tape(struct s_bkpinfo *bkpinfo)
+int closein_tape()
 {
     /*@ int's ******************************************************* */
@@ -241 +244 @@
  * @note This should be called by backup processes only.
  */
-int closeout_tape(struct s_bkpinfo *bkpinfo)
+int closeout_tape()
 {
     /*@ int's ******************************************************* */
@@ -274 +277 @@
         if (should_we_write_to_next_tape
             (bkpinfo->media_size[g_current_media_number], (off_t)256 * 1024)) {
-            start_to_write_to_next_tape(bkpinfo);
+            start_to_write_to_next_tape();
         }
     }
@@ -288 +291 @@
         if (should_we_write_to_next_tape (bkpinfo->media_size[g_current_media_number], 256*1024))
           {
-            start_to_write_to_next_tape (bkpinfo);
+            start_to_write_to_next_tape ();
           }
       }
@@ -438 +441 @@
 
 
-int read_EXAT_files_from_tape(struct s_bkpinfo *bkpinfo,
-                              long long *ptmp_size, char *tmp_fname,
+int read_EXAT_files_from_tape(long long *ptmp_size, char *tmp_fname,
                               int *pctrl_chr, char *xattr_fname,
                               char *acl_fname)
@@ -456 +458 @@
             fatal_error("Wrong order, sunshine.");
         }
-        read_file_from_stream_to_file(bkpinfo, xattr_fname, *ptmp_size);
+        read_file_from_stream_to_file(xattr_fname, *ptmp_size);
         res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
@@ -472 +474 @@
             wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
         }
-        read_file_from_stream_to_file(bkpinfo, acl_fname, *ptmp_size);
+        read_file_from_stream_to_file(acl_fname, *ptmp_size);
         res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
@@ -490 +492 @@
 
 
-int write_EXAT_files_to_tape(struct s_bkpinfo *bkpinfo, char *xattr_fname,
+int write_EXAT_files_to_tape(char *xattr_fname,
                              char *acl_fname)
 {
@@ -500 +502 @@
         write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
                              BLK_START_EXAT_FILE);
-        write_file_to_stream_from_file(bkpinfo, xattr_fname);
+        write_file_to_stream_from_file(xattr_fname);
         write_header_block_to_stream((off_t)-1, xattr_fname, BLK_STOP_EXAT_FILE);
     }
@@ -507 +509 @@
         write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
                              BLK_START_EXAT_FILE);
-        write_file_to_stream_from_file(bkpinfo, acl_fname);
+        write_file_to_stream_from_file(acl_fname);
         write_header_block_to_stream((off_t)-1, acl_fname, BLK_STOP_EXAT_FILE);
         write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
@@ -655 +657 @@
  * @note Equivalent to openin_tape() for now, but don't count on this behavior.
  */
-int openin_cdstream(struct s_bkpinfo *bkpinfo)
-{
-    return (openin_tape(bkpinfo));
+int openin_cdstream()
+{
+    return (openin_tape());
 }
 
@@ -696 +698 @@
  * @note This will also work with a cdstream for now, but don't count on this behavior.
  */
-int openin_tape(struct s_bkpinfo *bkpinfo)
+int openin_tape()
 {
     /*@ buffer ***************************************************** */
@@ -886 +888 @@
  */
 int
-read_file_from_stream_to_file(struct s_bkpinfo *bkpinfo, char *outfile,
-                              long long size)
+read_file_from_stream_to_file(char *outfile, long long size)
 {
 
@@ -895 +896 @@
     /*@ end vars *************************************************** */
 
-    res = read_file_from_stream_FULL(bkpinfo, outfile, NULL, size);
+    res = read_file_from_stream_FULL(outfile, NULL, size);
 
     return (res);
@@ -911 +912 @@
  */
 int
-read_file_from_stream_to_stream(struct s_bkpinfo *bkpinfo, FILE * fout,
-                                long long size)
+read_file_from_stream_to_stream(FILE * fout, long long size)
 {
 
@@ -920 +920 @@
     /*@ end vars *************************************************** */
 
-    res = read_file_from_stream_FULL(bkpinfo, NULL, fout, size);
+    res = read_file_from_stream_FULL(NULL, fout, size);
 /*  fflush(g_tape_stream);
   fflush(fout);*/
@@ -941 +941 @@
  */
 int
-read_file_from_stream_FULL(struct s_bkpinfo *bkpinfo, char *outfname,
-                           FILE * foutstream, long long orig_size)
+read_file_from_stream_FULL(char *outfname, FILE * foutstream, long long orig_size)
 {
     /*@ buffers ***************************************************** */
@@ -1029 +1028 @@
             log_msg(4, "where_I_was_... = %lld",
                     where_I_was_before_tape_change);
-            start_to_read_from_next_tape(bkpinfo);
+            start_to_read_from_next_tape();
             log_msg(4, "Started reading from next tape.");
             skip_incoming_files_until_we_find_this_one(temp_fname);
@@ -1362 +1361 @@
  * @return 0 for success, nonzero for failure.
  */
-int start_to_read_from_next_tape(struct s_bkpinfo *bkpinfo)
+int start_to_read_from_next_tape()
 {
     /*@ int ********************************************************* */
@@ -1410 +1409 @@
  * @return 0 for success, nonzero for failure.
  */
-int start_to_write_to_next_tape(struct s_bkpinfo *bkpinfo)
+int start_to_write_to_next_tape()
 {
     int res = 0;
@@ -1470 +1469 @@
  * @return 0 for success, nonzero for failure.
  */
-int write_backcatalog_to_tape(struct s_bkpinfo *bkpinfo)
+int write_backcatalog_to_tape()
 {
     int i, last, res = 0;
@@ -1488 +1487 @@
                                          BLK_START_AN_AFIO_OR_SLICE);
             log_msg(2, "Writing %s", fname);
-            if (write_file_to_stream_from_file(bkpinfo, fname)) {
+            if (write_file_to_stream_from_file(fname)) {
                 res++;
                 log_msg(2, "%s failed", fname);
@@ -1574 +1573 @@
  * @return 0 for success, nonzero for failure.
  */
-int write_file_to_stream_from_file(struct s_bkpinfo *bkpinfo, char *infile)
+int write_file_to_stream_from_file(char *infile)
 {
     /*@ buffers **************************************************** */
@@ -1621 +1620 @@
     if (should_we_write_to_next_tape
         (bkpinfo->media_size[g_current_media_number], filesize)) {
-        start_to_write_to_next_tape(bkpinfo);
-        write_backcatalog_to_tape(bkpinfo);
+        start_to_write_to_next_tape();
+        write_backcatalog_to_tape();
     }
     p = strrchr(infile, '/');
@@ -1659 +1658 @@
             fclose(fin);
             g_sigpipe = FALSE;
-            start_to_write_to_next_tape(bkpinfo);
-            write_backcatalog_to_tape(bkpinfo); // kinda-sorta recursive :)
+            start_to_write_to_next_tape();
+            write_backcatalog_to_tape();    // kinda-sorta recursive :)
             return (0);
         }