Changeset 2178 in MondoRescue

Timestamp:

Apr 25, 2009, 2:42:48 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug on array size reported by SuSE build system (Stephan Lauffer lauffer_at_ph-freiburg.de)

File:

• branches/2.2.9/mondo/src/common/libmondo-fork.c (modified) (3 diffs)

branches/2.2.9/mondo/src/common/libmondo-fork.c

@@ -3 +3 @@
 
 - subroutines for handling forking/pthreads/etc.
-
-
-01/20/2006
-- replaced partimagehack with ntfsclone
-
-06/20/2004
-- create fifo /var/log/partimagehack-debug.log and empty it
-  to keep ramdisk from filling up
-
-04/13/2004
-- >= should be <= g_loglevel
-
-11/15/2003
-- changed a few []s to char*s
-  
-10/12
-- rewrote partimagehack handling (multiple fifos, chunks, etc.)
-
-10/11
-- partimagehack now has debug level of N (set in my-stuff.h)
-
-10/08
-- call to partimagehack when restoring will now log errors to /var/log/....log
-
-10/06
-- cleaned up logging a bit
-
-09/30
-- line 735 - missing char* cmd in sprintf()
-
-09/28
-- added run_external_binary_with_percentage_indicator()
-- rewritten eval_call_to_make_ISO()
-
-09/18
-- call mkstemp instead of mktemp
-
-09/13
-- major NTFS hackage
-
-09/12
-- paranoid_system("rm -f /tmp/ *PARTIMAGE*") before calling partimagehack
-
-09/11
-- forward-ported unbroken feed_*_partimage() subroutines
-  from early August 2003
-
-09/08
-- detect & use partimagehack if it exists
-
-09/05
-- finally finished partimagehack hack :)
-
-07/04
-- added subroutines to wrap around partimagehack
-
-04/27
-- don't echo (...res=%d...) at end of log_it()
-  unnecessarily
-- replace newtFinished() and newtInit() with
-  newtSuspend() and newtResume()
-
-04/24
-- added some assert()'s and log_OS_error()'s
-
-04/09
-- cleaned up run_program_and_log_output()
-
-04/07
-- cleaned up code a bit
-- let run_program_and_log_output() accept -1 (only log if _no error_)
-
-01/02/2003
-- in eval_call_to_make_ISO(), append output to MONDO_LOGFILE
-  instead of a temporary stderr text file
-
-12/10
-- patch by Heiko Schlittermann to handle % chars in issue.net
-
-11/18
-- if mkisofs in eval_call_to_make_ISO() returns an error then return it,
-  whether ISO was created or not
-
-10/30
-- if mkisofs in eval_call_to_make_ISO() returns an error then find out if
-  the output (ISO) file has been created; if it has then return 0 anyway
-
-08/01 - 09/30
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- system() now includes 2>/dev/null
-- enlarged some tmp[]'s
-- added run_program_and_log_to_screen() and run_program_and_log_output()
-
-07/24
-- created
 */
 
@@ -554 +458 @@
     FILE *fout;
     FILE *ftmp;
+    int tmpcap = 512;
 
     log_msg(5, "Opening.");
-    malloc_string(tmp);
+    if (!(tmp = malloc(tmpcap))) {
+        fatal_error("Failed to malloc() tmp");
+    }
     tmp[0] = '\0';
     bufcap = 256L * 1024L;
@@ -656 +563 @@
                 sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
 //    log_msg(0, tmp);
-                fread(tmp, 1, 512, fin);
+                fread(tmp, 1, tmpcap, fin);
                 log_msg(0, "tmp = '%s'", tmp);
-                fwrite(tmp, 1, 512, ftmp);
+                fwrite(tmp, 1, tmpcap, ftmp);
                 fclose(ftmp);
                 fatal_error("Missing terminating block");