Changeset 3860 in MondoRescue for branches/3.3/mondo/src

Timestamp:

Mar 7, 2024, 11:00:54 AM (14 months ago)

Author:

Bruno Cornec

Message:

Fix proto for write_header_block_to_stream

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-stream-EXT.h (modified) (1 diff)
• libmondo-stream.c (modified) (7 diffs)
• libmondo-stream.h (modified) (1 diff)

branches/3.3/mondo/src/common/libmondo-archive.c

@@ -2159 +2159 @@
         res = make_afioballs_and_images_OLD();
 #endif
-        write_header_block_to_stream((off_t)0, "stop-afioballs",
-                                     BLK_STOP_AFIOBALLS);
+        write_header_block_to_stream((off_t)0, "stop-afioballs", BLK_STOP_AFIOBALLS);
     } else {
         res = make_afioballs_and_images();
@@ -2423 +2422 @@
         /* ask for new tape if necessary */
         length_of_incoming_file = length_of_file(curr_file);
-        write_header_block_to_stream(length_of_incoming_file, curr_file,
-                                     start_chr);
+        write_header_block_to_stream(length_of_incoming_file, curr_file, start_chr);
         res = write_file_to_stream_from_file(curr_file);
         retval += res;

branches/3.3/mondo/src/common/libmondo-stream-EXT.h

@@ -36 +36 @@
 extern int write_file_to_stream_from_file(
                                           char *infile);
-extern int write_header_block_to_stream(off_t length_of_incoming_file,
-                                        char *filename, int control_char);
+extern int write_header_block_to_stream(off_t length_of_incoming_file, const char *filename, int control_char);
 extern void wrong_marker(int should_be, int it_is);
 extern int closein_cdstream();

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

@@ -91 +91 @@
 {
     return (closein_tape());
+}
+
+/**
+ * Write a header block to the opened stream (CD or tape).
+ * @param length_of_incoming_file The length to store in the header block.
+ * Usually matters only if this is a file-related header, in which case it should
+ * be the length of the file that will follow.
+ * @param filename The filename to store in the header block. Usually matters
+ * only if this is a file-related header, in which case this should be the name
+ * if the file that will follow.
+ * @param control_char The type of header block this is (start-file, end-file, start-tape, ...)
+ * @return 0 for success, nonzero for failure.
+ */
+int write_header_block_to_stream(off_t length_of_incoming_file, const char *filename, int control_char)
+{
+    /*@ buffers **************************************************** */
+    char tempblock[TAPE_BLOCK_SIZE];
+    char *p;
+    char *tmp = NULL;
+
+    /*@ int ******************************************************** */
+    int i;
+
+    off_t olen;
+
+    /*@ end vars *************************************************** */
+
+    olen = length_of_incoming_file;
+    p = strrchr(filename, '/'); /* Make 'em go, "Unnnh!" Oh wait, that was _Master_ P... */
+    if (!p) {
+        p = filename;
+    } else {
+        p++;
+    }
+    if (!g_tape_stream) {
+        log_to_screen("You're not backing up to tape. Why write a tape header?");
+        return (1);
+    }
+    for (i = 0; i < (int) TAPE_BLOCK_SIZE; i++) {
+        tempblock[i] = 0;
+    }
+    sprintf(tempblock + 6000 + control_char, STR_HEADER);
+    tempblock[7000] = control_char;
+    if (length_of_incoming_file > 0) {
+        memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));
+    }
+    strcpy(tempblock + 1000, filename);
+    g_tape_posK += fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream) / 1024;
+    tmp = marker_to_string(control_char);
+    log_msg(6, "%s (fname=%s, size=%ld K)", tmp, p, (long) length_of_incoming_file >> 10);
+    mr_free(tmp);
+    return (0);
 }
 
@@ -418 +470 @@
     if (g_getfattr) {
     // xattr
-        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
-                             BLK_START_EXTENDED_ATTRIBUTES);
-        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
-                             BLK_START_EXAT_FILE);
+        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname, BLK_START_EXTENDED_ATTRIBUTES);
+        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname, BLK_START_EXAT_FILE);
         write_file_to_stream_from_file(xattr_fname);
         write_header_block_to_stream((off_t)-1, xattr_fname, BLK_STOP_EXAT_FILE);
-        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
-                             BLK_STOP_EXTENDED_ATTRIBUTES);
+        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname, BLK_STOP_EXTENDED_ATTRIBUTES);
     }
     if (g_getfacl) {
     // acl
-        write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
-                             BLK_START_EXTENDED_ATTRIBUTES);
-        write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
-                             BLK_START_EXAT_FILE);
+        write_header_block_to_stream(length_of_file(acl_fname), acl_fname, BLK_START_EXTENDED_ATTRIBUTES);
+        write_header_block_to_stream(length_of_file(acl_fname), acl_fname, BLK_START_EXAT_FILE);
         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(acl_fname), acl_fname,
-                             BLK_STOP_EXTENDED_ATTRIBUTES);
+        write_header_block_to_stream(length_of_file(acl_fname), acl_fname, BLK_STOP_EXTENDED_ATTRIBUTES);
     }
     return (res);
@@ -1519 +1565 @@
             log_msg(6, "Can't write %s - it doesn't exist.", fname);
         } else {
-            write_header_block_to_stream(length_of_file(fname),
-                                         "start-backcatalog-afio-or-slice",
-                                         BLK_START_AN_AFIO_OR_SLICE);
+            write_header_block_to_stream(length_of_file(fname), "start-backcatalog-afio-or-slice", BLK_START_AN_AFIO_OR_SLICE);
             log_msg(2, "Writing %s", fname);
             if (write_file_to_stream_from_file(fname)) {
@@ -1528 +1572 @@
             }
             if (i != last) {
-                write_header_block_to_stream((off_t)0,
-                                             "stop-backcatalog-afio-or-slice",
-                                             BLK_STOP_AN_AFIO_OR_SLICE);
+                write_header_block_to_stream((off_t)0, "stop-backcatalog-afio-or-slice", BLK_STOP_AN_AFIO_OR_SLICE);
             }
         }
@@ -1651 +1693 @@
     }
     filesize = length_of_file(infile);
-    if (should_we_write_to_next_tape
-        (bkpinfo->media_size, filesize)) {
+    if (should_we_write_to_next_tape(bkpinfo->media_size, filesize)) {
         start_to_write_to_next_tape();
         write_backcatalog_to_tape();
@@ -1663 +1704 @@
     }
     log_it("Writing file '%s' to tape (%ld KB)", p, (long) filesize >> 10);
-    write_header_block_to_stream(filesize, infile_basename,
-                                 BLK_START_FILE);
+    write_header_block_to_stream(filesize, infile_basename, BLK_START_FILE);
 //go_here_to_restart_saving_of_file:
     if (!(fin = fopen(infile, "r"))) {
@@ -1717 +1757 @@
 
 
-/**
- * Write a header block to the opened stream (CD or tape).
- * @param length_of_incoming_file The length to store in the header block.
- * Usually matters only if this is a file-related header, in which case it should
- * be the length of the file that will follow.
- * @param filename The filename to store in the header block. Usually matters
- * only if this is a file-related header, in which case this should be the name
- * if the file that will follow.
- * @param control_char The type of header block this is (start-file, end-file, start-tape, ...)
- * @return 0 for success, nonzero for failure.
- */
-int
-write_header_block_to_stream(off_t length_of_incoming_file,
-                             char *filename, int control_char)
-{
-    /*@ buffers **************************************************** */
-    char tempblock[TAPE_BLOCK_SIZE];
-    char *p;
-    char *tmp = NULL;
-
-    /*@ int ******************************************************** */
-    int i;
-
-    off_t olen;
-
-    /*@ end vars *************************************************** */
-
-    olen = length_of_incoming_file;
-    p = strrchr(filename, '/'); /* Make 'em go, "Unnnh!" Oh wait, that was _Master_ P... */
-    if (!p) {
-        p = filename;
-    } else {
-        p++;
-    }
-    if (!g_tape_stream) {
-        log_to_screen("You're not backing up to tape. Why write a tape header?");
-        return (1);
-    }
-    for (i = 0; i < (int) TAPE_BLOCK_SIZE; i++) {
-        tempblock[i] = 0;
-    }
-    sprintf(tempblock + 6000 + control_char, STR_HEADER);
-    tempblock[7000] = control_char;
-    if (length_of_incoming_file > 0) {
-        memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));
-    }
-    strcpy(tempblock + 1000, filename);
-    g_tape_posK += fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream) / 1024;
-    tmp = marker_to_string(control_char);
-    log_msg(6, "%s (fname=%s, size=%ld K)", tmp, p, (long) length_of_incoming_file >> 10);
-    mr_free(tmp);
-    return (0);
-}
-
-
-
 
 

branches/3.3/mondo/src/common/libmondo-stream.h

@@ -35 +35 @@
 int write_file_to_stream_from_file(
                                    char *infile);
-int write_header_block_to_stream(off_t length_of_incoming_file,
-                                 char *filename, int control_char);
 void wrong_marker(int should_be, int it_is);
 int closein_cdstream();