Changeset 783 in MondoRescue for trunk/mondo

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

Location:

trunk/mondo

Files:

• Doxyfile (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• configure.in (modified) (1 diff)
• mondo/Makefile.am (modified) (1 diff)
• mondo/common/Makefile.am (modified) (2 diffs)
• mondo/common/libmondo-archive-EXT.h (modified) (1 diff)
• mondo/common/libmondo-archive.c (modified) (54 diffs)
• mondo/common/libmondo-archive.h (modified) (1 diff)
• mondo/common/libmondo-devices-EXT.h (modified) (2 diffs)
• mondo/common/libmondo-devices.c (modified) (24 diffs)
• mondo/common/libmondo-devices.h (modified) (3 diffs)
• mondo/common/libmondo-filelist.c (modified) (6 diffs)
• mondo/common/libmondo-files-EXT.h (modified) (1 diff)
• mondo/common/libmondo-files.c (modified) (8 diffs)
• mondo/common/libmondo-files.h (modified) (1 diff)
• mondo/common/libmondo-fork.c (modified) (11 diffs)
• mondo/common/libmondo-mountlist.c (modified) (5 diffs)
• mondo/common/libmondo-msg.c (modified) (1 diff)
• mondo/common/libmondo-raid.c (modified) (5 diffs)
• mondo/common/libmondo-stream.c (modified) (5 diffs)
• mondo/common/libmondo-string-EXT.h (modified) (2 diffs)
• mondo/common/libmondo-string.c (modified) (8 diffs)
• mondo/common/libmondo-string.h (modified) (2 diffs)
• mondo/common/libmondo-tools.c (modified) (19 diffs)
• mondo/common/libmondo-verify.c (modified) (8 diffs)
• mondo/common/mondostructures.h (modified) (13 diffs)
• mondo/common/newt-specific.c (modified) (11 diffs)
• mondo/include (added)
• mondo/include/mr_conf.h (moved) (moved from trunk/mondo/mondo/lib/mr_conf.h ) (2 diffs)
• mondo/include/mr_string.h (moved) (moved from trunk/mondo/mondo/lib/mr_string.h ) (1 diff)
• mondo/include/my-stuff.h (moved) (moved from trunk/mondo/mondo/common/my-stuff.h ) (1 diff)
• mondo/lib/Makefile.am (modified) (1 diff)
• mondo/mondoarchive/Makefile.am (modified) (2 diffs)
• mondo/mondoarchive/main.c (modified) (8 diffs)
• mondo/mondoarchive/mondo-cli.c (modified) (26 diffs)
• mondo/mondorestore/Makefile.am (modified) (2 diffs)
• mondo/mondorestore/mondo-prep.c (modified) (23 diffs)
• mondo/mondorestore/mondo-restore-EXT.h (modified) (3 diffs)
• mondo/mondorestore/mondo-restore.c (modified) (41 diffs)
• mondo/mondorestore/mondo-restore.h (modified) (2 diffs)
• mondo/mondorestore/mondo-rstr-compare.c (modified) (7 diffs)
• mondo/mondorestore/mondo-rstr-newt.c (modified) (14 diffs)
• mondo/mondorestore/mondo-rstr-newt.h (modified) (1 diff)
• mondo/mondorestore/mondo-rstr-tools.c (modified) (21 diffs)

trunk/mondo/Doxyfile

@@ -1 @@
-# Doxyfile 1.3.2
+# Generated by doxygen 1.4.4
 
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = "Mondo Rescue"
-PROJECT_NUMBER         = 2.0x
-OUTPUT_DIRECTORY       = doc
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
-EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = YES
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = YES
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ALWAYS_DETAILED_SEC    = YES
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-SHORT_NAMES            = NO
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-JAVADOC_AUTOBRIEF      = YES
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 4
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ALIASES                = 
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = NO
-SHOW_USED_FILES        = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = mondo/mondo.dox \
-                         mondo/common/ \
-                         mondo/mondoarchive/ \
-                         mondo/mondorestore/
-FILE_PATTERNS          = *.c \
-                         m*.h
-RECURSIVE              = YES
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = YES
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = YES
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = YES
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = YES
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = linux
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = YES
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 0
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
-CGI_NAME               = search.cgi
-CGI_URL                = 
-DOC_URL                = 
-DOC_ABSPATH            = 
-BIN_ABSPATH            = /usr/local/bin/
-EXT_DOC_PATHS          = 
+# This file describes styles used for generating RTF output.
+# All text after a hash (#) is considered a comment and will be ignored.
+# Remove a hash to activate a line.
+
+# Heading1 = \s1\sb240\sa60\keepn\widctlpar\adjustright \b\f1\fs36\kerning36\cgrid \sbasedon0 \snext0 heading 1
+# Heading2 = \s2\sb240\sa60\keepn\widctlpar\adjustright \b\f1\fs28\kerning28\cgrid \sbasedon0 \snext0 heading 2
+# Heading3 = \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid \sbasedon0 \snext0 heading 3
+# Heading4 = \s4\sb240\sa60\keepn\widctlpar\adjustright \b\f1\fs20\cgrid \sbasedon0 \snext0 heading 4;}{\*\cs10 \additive Default Paragraph Font
+# Heading5 = \s5\sb90\sa30\keepn\widctlpar\adjustright \b\f1\fs20\cgrid \sbasedon0 \snext0 heading 5;}{\*\cs10 \additive Default Paragraph Font
+# Title = \s15\qc\sb240\sa60\widctlpar\outlinelevel0\adjustright \b\f1\fs32\kerning28\cgrid \sbasedon0 \snext15 Title
+# SubTitle = \s16\qc\sa60\widctlpar\outlinelevel1\adjustright \f1\cgrid \sbasedon0 \snext16 Subtitle
+# BodyText = \s17\sa60\sb30\widctlpar\qj \fs22\cgrid \sbasedon0 \snext17 BodyText
+# DenseText = \s18\widctlpar\fs22\cgrid \sbasedon0 \snext18 DenseText
+# Header = \s28\widctlpar\tqc\tx4320\tqr\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext28 header
+# Footer = \s29\widctlpar\tqc\tx4320\tqr\tx8640\qr\adjustright \fs20\cgrid \sbasedon0 \snext29 footer
+# GroupHeader = \s30\li360\sa60\sb120\keepn\widctlpar\adjustright \b\f1\fs20\cgrid \sbasedon0 \snext30 GroupHeader
+# CodeExample0 = \s40\li0\widctlpar\adjustright \shading1000\cbpat8 \f2\fs16\cgrid \sbasedon0 \snext41 Code Example 0
+# CodeExample1 = \s41\li360\widctlpar\adjustright \shading1000\cbpat8 \f2\fs16\cgrid \sbasedon0 \snext42 Code Example 1
+# CodeExample2 = \s42\li720\widctlpar\adjustright \shading1000\cbpat8 \f2\fs16\cgrid \sbasedon0 \snext43 Code Example 2
+# CodeExample3 = \s43\li1080\widctlpar\adjustright \shading1000\cbpat8 \f2\fs16\cgrid \sbasedon0 \snext44 Code Example 3
+# CodeExample4 = \s44\li1440\widctlpar\adjustright \shading1000\cbpat8 \f2\fs16\cgrid \sbasedon0 \snext45 Code Example 4
+# CodeExample5 = \s45\li1800\widctlpar\adjustright \shading1000\cbpat8 \f2\fs16\cgrid \sbasedon0 \snext46 Code Example 5
+# CodeExample6 = \s46\li2160\widctlpar\adjustright \shading1000\cbpat8 \f2\fs16\cgrid \sbasedon0 \snext47 Code Example 6
+# CodeExample7 = \s47\li2520\widctlpar\adjustright \shading1000\cbpat8 \f2\fs16\cgrid \sbasedon0 \snext48 Code Example 7
+# CodeExample8 = \s48\li2880\widctlpar\adjustright \shading1000\cbpat8 \f2\fs16\cgrid \sbasedon0 \snext49 Code Example 8
+# CodeExample9 = \s49\li3240\widctlpar\adjustright \shading1000\cbpat8 \f2\fs16\cgrid \sbasedon0 \snext49 Code Example 9
+# ListContinue0 = \s50\li0\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid \sbasedon0 \snext51 List Continue 0
+# ListContinue1 = \s51\li360\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid \sbasedon0 \snext52 List Continue 1
+# ListContinue2 = \s52\li720\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid \sbasedon0 \snext53 List Continue 2
+# ListContinue3 = \s53\li1080\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid \sbasedon0 \snext54 List Continue 3
+# ListContinue4 = \s54\li1440\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid \sbasedon0 \snext55 List Continue 4
+# ListContinue5 = \s55\li1800\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid \sbasedon0 \snext56 List Continue 5
+# ListContinue6 = \s56\li2160\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid \sbasedon0 \snext57 List Continue 6
+# ListContinue7 = \s57\li2520\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid \sbasedon0 \snext58 List Continue 7
+# ListContinue8 = \s58\li2880\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid \sbasedon0 \snext59 List Continue 8
+# ListContinue9 = \s59\li3240\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid \sbasedon0 \snext59 List Continue 9
+# DescContinue0 = \s60\li0\widctlpar\ql\adjustright \fs20\cgrid \sbasedon0 \snext61 DescContinue 0
+# DescContinue1 = \s61\li360\widctlpar\ql\adjustright \fs20\cgrid \sbasedon0 \snext62 DescContinue 1
+# DescContinue2 = \s62\li720\widctlpar\ql\adjustright \fs20\cgrid \sbasedon0 \snext63 DescContinue 2
+# DescContinue3 = \s63\li1080\widctlpar\ql\adjustright \fs20\cgrid \sbasedon0 \snext64 DescContinue 3
+# DescContinue4 = \s64\li1440\widctlpar\ql\adjustright \fs20\cgrid \sbasedon0 \snext65 DescContinue 4
+# DescContinue5 = \s65\li1800\widctlpar\ql\adjustright \fs20\cgrid \sbasedon0 \snext66 DescContinue 5
+# DescContinue6 = \s66\li2160\widctlpar\ql\adjustright \fs20\cgrid \sbasedon0 \snext67 DescContinue 6
+# DescContinue7 = \s67\li2520\widctlpar\ql\adjustright \fs20\cgrid \sbasedon0 \snext68 DescContinue 7
+# DescContinue8 = \s68\li2880\widctlpar\ql\adjustright \fs20\cgrid \sbasedon0 \snext69 DescContinue 8
+# DescContinue9 = \s69\li3240\widctlpar\ql\adjustright \fs20\cgrid \sbasedon0 \snext69 DescContinue 9
+# LatexTOC0 = \s70\li0\sa30\sb30\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext81 LatexTOC 0
+# LatexTOC1 = \s71\li360\sa27\sb27\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext82 LatexTOC 1
+# LatexTOC2 = \s72\li720\sa24\sb24\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext83 LatexTOC 2
+# LatexTOC3 = \s73\li1080\sa21\sb21\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext84 LatexTOC 3
+# LatexTOC4 = \s74\li1440\sa18\sb18\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext85 LatexTOC 4
+# LatexTOC5 = \s75\li1800\sa15\sb15\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext86 LatexTOC 5
+# LatexTOC6 = \s76\li2160\sa12\sb12\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext87 LatexTOC 6
+# LatexTOC7 = \s77\li2520\sa9\sb9\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext88 LatexTOC 7
+# LatexTOC8 = \s78\li2880\sa6\sb6\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext89 LatexTOC 8
+# LatexTOC9 = \s79\li3240\sa3\sb3\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid \sbasedon0 \snext89 LatexTOC 9
+# ListBullet0 = \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid \sbasedon0 \snext81 \sautoupd List Bullet 0
+# ListBullet1 = \s81\fi-360\li720\widctlpar\jclisttab\tx720{\*\pn \pnlvlbody\ilvl0\ls2\pnrnot0\pndec }\ls2\adjustright \fs20\cgrid \sbasedon0 \snext82 \sautoupd List Bullet 1
+# ListBullet2 = \s82\fi-360\li1080\widctlpar\jclisttab\tx1080{\*\pn \pnlvlbody\ilvl0\ls3\pnrnot0\pndec }\ls3\adjustright \fs20\cgrid \sbasedon0 \snext83 \sautoupd List Bullet 2
+# ListBullet3 = \s83\fi-360\li1440\widctlpar\jclisttab\tx1440{\*\pn \pnlvlbody\ilvl0\ls4\pnrnot0\pndec }\ls4\adjustright \fs20\cgrid \sbasedon0 \snext84 \sautoupd List Bullet 3
+# ListBullet4 = \s84\fi-360\li1800\widctlpar\jclisttab\tx1800{\*\pn \pnlvlbody\ilvl0\ls5\pnrnot0\pndec }\ls5\adjustright \fs20\cgrid \sbasedon0 \snext85 \sautoupd List Bullet 4
+# ListBullet5 = \s85\fi-360\li2160\widctlpar\jclisttab\tx2160{\*\pn \pnlvlbody\ilvl0\ls6\pnrnot0\pndec }\ls6\adjustright \fs20\cgrid \sbasedon0 \snext86 \sautoupd List Bullet 5
+# ListBullet6 = \s86\fi-360\li2520\widctlpar\jclisttab\tx2520{\*\pn \pnlvlbody\ilvl0\ls7\pnrnot0\pndec }\ls7\adjustright \fs20\cgrid \sbasedon0 \snext87 \sautoupd List Bullet 6
+# ListBullet7 = \s87\fi-360\li2880\widctlpar\jclisttab\tx2880{\*\pn \pnlvlbody\ilvl0\ls8\pnrnot0\pndec }\ls8\adjustright \fs20\cgrid \sbasedon0 \snext88 \sautoupd List Bullet 7
+# ListBullet8 = \s88\fi-360\li3240\widctlpar\jclisttab\tx3240{\*\pn \pnlvlbody\ilvl0\ls9\pnrnot0\pndec }\ls9\adjustright \fs20\cgrid \sbasedon0 \snext89 \sautoupd List Bullet 8
+# ListBullet9 = \s89\fi-360\li3600\widctlpar\jclisttab\tx3600{\*\pn \pnlvlbody\ilvl0\ls10\pnrnot0\pndec }\ls10\adjustright \fs20\cgrid \sbasedon0 \snext89 \sautoupd List Bullet 9
+# ListEnum0 = \s90\fi-360\li360\widctlpar\fs20\cgrid \sbasedon0 \snext91 \sautoupd List Enum 0
+# ListEnum1 = \s91\fi-360\li720\widctlpar\fs20\cgrid \sbasedon0 \snext92 \sautoupd List Enum 1
+# ListEnum2 = \s92\fi-360\li1080\widctlpar\fs20\cgrid \sbasedon0 \snext93 \sautoupd List Enum 2
+# ListEnum3 = \s93\fi-360\li1440\widctlpar\fs20\cgrid \sbasedon0 \snext94 \sautoupd List Enum 3
+# ListEnum4 = \s94\fi-360\li1800\widctlpar\fs20\cgrid \sbasedon0 \snext95 \sautoupd List Enum 4
+# ListEnum5 = \s95\fi-360\li2160\widctlpar\fs20\cgrid \sbasedon0 \snext96 \sautoupd List Enum 5
+# ListEnum6 = \s96\fi-360\li2520\widctlpar\fs20\cgrid \sbasedon0 \snext96 \sautoupd List Enum 5
+# ListEnum7 = \s97\fi-360\li2880\widctlpar\fs20\cgrid \sbasedon0 \snext98 \sautoupd List Enum 7
+# ListEnum8 = \s98\fi-360\li3240\widctlpar\fs20\cgrid \sbasedon0 \snext99 \sautoupd List Enum 8
+# ListEnum9 = \s99\fi-360\li3600\widctlpar\fs20\cgrid \sbasedon0 \snext99 \sautoupd List Enum 9

trunk/mondo/Makefile.am

@@ -6 +6 @@
 
 EXTRA_DIST = config.rpath mkinstalldirs
+
+

trunk/mondo/configure.in

@@ -125 +125 @@
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
+AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr strspn getline asprintf trunc vasprintf])
 
-AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile po/Makefile.in m4/Makefile])
+AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/lib/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile])

trunk/mondo/mondo/Makefile.am

@@ -1 @@
-SUBDIRS        = common mondoarchive mondorestore restore-scripts post-nuke.sample
+SUBDIRS        = lib common mondoarchive mondorestore restore-scripts post-nuke.sample
 DIST_SUBDIRS   = ${SUBDIRS}
 

trunk/mondo/mondo/common/Makefile.am

@@ -2 +2 @@
 ## Process this file with Automake to generate `Makefile.in'
 ##
-AM_CPPFLAGS = -DMONDO_SHARE=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -DMONDO_SHARE=\"$(pkgdatadir)\" -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/mondo/include
 
 ## libmondo
@@ -8 +8 @@
 
 libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
-                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                       libmondo-mountlist.c libmondo-raid.c libmondo-msg.c \
-                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                       libmondo-verify.c newt-specific.c \
-                       libmondo-archive.h libmondo-devices.h \
-                       libmondo-filelist.h libmondo-files.h libmondo-fork.h \
-                       libmondo-mountlist.h libmondo-raid.h \
-                       libmondo-stream.h libmondo-string.h libmondo-tools.h \
-                       libmondo-verify.h libmondo-fifo.h \
-                       libmondo-archive-EXT.h my-stuff.h mondostructures.h \
-                       libmondo-devices-EXT.h libmondo-fifo-EXT.h \
-                       libmondo-files-EXT.h libmondo-fork-EXT.h \
-                       libmondo-filelist-EXT.h \
-                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
-                       libmondo-string-EXT.h libmondo-tools-EXT.h \
-                       libmondo-verify-EXT.h  libmondo-stream-EXT.h \
-                       newt-specific.h
+                    libmondo-filelist.c libmondo-files.c libmondo-fork.c \
+                    libmondo-mountlist.c libmondo-raid.c libmondo-msg.c \
+                    libmondo-stream.c libmondo-string.c libmondo-tools.c \
+                    libmondo-verify.c newt-specific.c \
+                    libmondo-archive.h libmondo-devices.h \
+                    libmondo-filelist.h libmondo-files.h libmondo-fork.h \
+                    libmondo-mountlist.h libmondo-raid.h \
+                    libmondo-stream.h libmondo-string.h libmondo-tools.h \
+                    libmondo-verify.h libmondo-fifo.h \
+                    libmondo-archive-EXT.h my-stuff.h mondostructures.h \
+                    libmondo-devices-EXT.h libmondo-fifo-EXT.h \
+                    libmondo-files-EXT.h libmondo-fork-EXT.h \
+                    libmondo-filelist-EXT.h \
+                    libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
+                    libmondo-string-EXT.h libmondo-tools-EXT.h \
+                    libmondo-verify-EXT.h  libmondo-stream-EXT.h \
+                    newt-specific.h

trunk/mondo/mondo/common/libmondo-archive-EXT.h

@@ -15 +15 @@
 extern int make_slices_and_images(struct s_bkpinfo *bkpinfo,
                                   char *biggielist_fname);
-extern int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile);
+extern int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile);
 extern int make_afioballs_and_images(struct s_bkpinfo *bkpinfo);
 extern int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...);

trunk/mondo/mondo/common/libmondo-archive.c

@@ -10 +10 @@
  */
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
+#include "mr_conf.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-stream-EXT.h"
@@ -80 +81 @@
  */
 t_bkptype g_backup_media_type = none;
+char *g_backup_media_string = NULL;
 
 /**
@@ -231 +233 @@
         log_msg(5, "command='%s'", command);
         res = system(command);
-        tmp = last_line_of_file(MONDO_LOGFILE));
+        tmp = last_line_of_file(MONDO_LOGFILE);
         log_msg(1, "res=%d; tmp='%s'", res, tmp);
         if (bkpinfo->use_star && (res == 254 || res == 65024)
@@ -390 +392 @@
     }
 
-    if (g_tmpfs_mountpt[0] != '\0') {
+    if (g_tmpfs_mountpt != NULL) {
         tmp = call_program_and_get_last_line_of_output
                  ("df -m -P | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4");
@@ -424 +426 @@
  * @ingroup archiveGroup
  */
-int backup_data(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int backup_data(struct s_bkpinfo *bkpinfo)
 {
     int retval = 0, res = 0;
@@ -651 +653 @@
         else
             ch = 'U';
+
         if (bkpinfo->boot_loader != '\0') {
             asprintf(&tmp, "User specified boot loader. It is '%c'.",
@@ -743 +746 @@
     }
     paranoid_free(tmp);
+    /* BERLIOS: Use bkptype_to_string without LANG */
     switch (bkpinfo->backup_media_type) {
     case cdr:
@@ -1106 +1110 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_final_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int do_that_final_phase(struct s_bkpinfo *bkpinfo)
 {
 
@@ -1125 +1129 @@
     } else {
         /* write final ISO */
-        res = write_final_iso_if_necessary(bkpinfo, mrconf);
+        res = write_final_iso_if_necessary(bkpinfo);
         retval += res;
         if (res) {
@@ -1178 +1182 @@
     g_serial_string = call_program_and_get_last_line_of_output("dd \
 if=/dev/urandom bs=16 count=1 2> /dev/null | \
-hexdump | tr -s ' ' '0' | head -n1"));
+hexdump | tr -s ' ' '0' | head -n1");
     asprintf(&tmp, "%s...word.", g_serial_string);
     paranoid_free(g_serial_string);
@@ -1269 +1273 @@
     }
 /* if not Debian then go ahead & use fdformat */
-    tempfile = call_program_and_get_last_line_of_output("mktemp -q /tmp/mondo.XXXXXXXX"));
+    tempfile = call_program_and_get_last_line_of_output("mktemp -q /tmp/mondo.XXXXXXXX");
     asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile,
              tempfile, tempfile);
@@ -1294 +1298 @@
         if (trackno <= 5 && last_trkno > 40) {
             close_evalcall_form();
-            strcpy(title, "Verifying format");
-            open_evalcall_form(title);
+            open_evalcall_form("Verifying format");
         }
         last_trkno = trackno;
@@ -1401 +1404 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_afioballs_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_afioballs_and_images(struct s_bkpinfo *bkpinfo)
 {
 
@@ -1544 +1547 @@
             } else {
                 res =
-                    move_files_to_cd(bkpinfo, mrconf, storing_filelist_fname,
+                    move_files_to_cd(bkpinfo, storing_filelist_fname,
                                      curr_xattr_list_fname,
                                      curr_acl_list_fname,
@@ -1624 +1627 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile)
+int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile)
 {
     /*@ int ********************************************** */
@@ -1667 +1670 @@
     /* BERLIOS: Do not ignore getcwd result */
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    asprintf(&tmp, "chmod 744 %s", bkpinfo->scratchdir);
+    asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
     chdir(bkpinfo->scratchdir);
 
-    if (bkpinfo->call_before_iso[0] != '\0') {
+    if (bkpinfo->call_before_iso != NULL) {
         asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
                  g_current_media_number);
@@ -1687 +1690 @@
     }
 
-    if (bkpinfo->call_make_iso[0] != '\0') {
+    if (bkpinfo->call_make_iso != NULL) {
         log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
         asprintf(&tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
         asprintf(&message_to_screen, "Making an ISO (%s #%d)",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
 
@@ -1789 +1792 @@
     } else {
         asprintf(&message_to_screen, "Running mkisofs to make %s #%d",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
         log_msg(1, message_to_screen);
         asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
         if (bkpinfo->nonbootable_backup) {
@@ -1818 +1821 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", mrconf->ia64_boot_size);
+                asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", bkpinfo->mrconf->mindi_ia64_boot_size);
                 res = eval_call_to_make_ISO(bkpinfo,
                                             tmp2,
@@ -1870 +1873 @@
     }
 
-    if (bkpinfo->call_burn_iso[0] != '\0') {
+    if (bkpinfo->call_burn_iso != NULL) {
         log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
         asprintf(&message_to_screen, "Burning %s #%d",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
         pause_and_ask_for_cdr(2, &cd_is_mountable);
@@ -1888 +1891 @@
     }
 
-    if (bkpinfo->call_after_iso[0] != '\0') {
+    if (bkpinfo->call_after_iso != NULL) {
         asprintf(&message_to_screen, "Running post-ISO call (%s #%d)",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
         res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_after_iso,
@@ -1922 +1925 @@
              bigfile_fname);
     log_msg(1, "command = '%s'", command);
-    tmp = call_program_and_get_last_line_of_output(command));
+    tmp = call_program_and_get_last_line_of_output(command);
     log_msg(1, "--> tmp = '%s'", tmp);
     paranoid_free(command);
@@ -1951 +1954 @@
  */
 int
-make_slices_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggielist_fname)
+make_slices_and_images(struct s_bkpinfo *bkpinfo, char *biggielist_fname)
 {
 
@@ -2070 +2073 @@
             }
             res =
-                slice_up_file_etc(bkpinfo, mrconf, bigfile_fname,
+                slice_up_file_etc(bkpinfo, bigfile_fname,
                                   ntfsprog_fifo, biggie_file_number,
                                   noof_biggie_files, use_ntfsprog);
@@ -2119 +2122 @@
  * @see make_afioballs_and_images
  */
-int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo)
 {
 
@@ -2193 +2196 @@
         } else {
             res =
-                move_files_to_cd(bkpinfo, mrconf, curr_filelist_fname,
+                move_files_to_cd(bkpinfo, curr_filelist_fname,
                                  curr_xattr_list_fname,
                                  curr_acl_list_fname, curr_afioball_fname,
@@ -2241 +2244 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_afios_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_those_afios_phase(struct s_bkpinfo *bkpinfo)
 {
     /*@ int ******************************************* */
@@ -2258 +2261 @@
         log_msg(1,
                 "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
-        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
+        res = make_afioballs_and_images_OLD(bkpinfo);
 #else
-        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
+        res = make_afioballs_and_images_OLD(bkpinfo);
 #endif
         write_header_block_to_stream((off_t)0, "stop-afioballs",
                                      BLK_STOP_AFIOBALLS);
     } else {
-        res = make_afioballs_and_images(bkpinfo, mrconf);
+        res = make_afioballs_and_images(bkpinfo);
     }
 
@@ -2371 +2374 @@
  * transfer files over the network) or leave it as is.
  */
-int (*move_files_to_cd) (struct s_bkpinfo *, struct s_mrconf *mrconf, char *, ...) =
+int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...) =
     _move_files_to_cd;
 
@@ -2392 +2395 @@
  * @return The number of errors encountered (0 for success)
  */
-int _move_files_to_cd(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *files_to_add, ...)
+int _move_files_to_cd(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
 {
 
@@ -2431 +2434 @@
     if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
         /* FALSE because this is not the last CD we'll write */
-        res = write_iso_and_go_on(bkpinfo, mrconf, FALSE);
+        res = write_iso_and_go_on(bkpinfo, FALSE);
         retval += res;
         if (res) {
@@ -2823 +2826 @@
 
     asprintf(&szmsg, "I am about to burn %s #%d",
-             media_descriptor_string(g_backup_media_type),
+             g_backup_media_string,
              g_current_media_number);
     log_to_screen(szmsg);
@@ -2860 +2863 @@
             log_to_screen
                 ("%s has data on it but it's probably not a Mondo CD.",
-                 media_descriptor_string(g_backup_media_type));
+                 g_backup_media_string);
             asprintf(&our_serial_str, "%s", "");
         } else {
             log_to_screen("%s found in drive. It's a Mondo disk.",
-                          media_descriptor_string(g_backup_media_type));
+                          g_backup_media_string);
             tmp1 = last_line_of_file(szcdno);
             cd_number = atoi(tmp1);
@@ -2885 +2888 @@
         if (cd_number > 0 && !strcmp(our_serial_str, g_serial_string)) {
             log_msg(2, "This %s is part of this backup set!",
-                    media_descriptor_string(g_backup_media_type));
+                    g_backup_media_string);
             ok_go_ahead_burn_it = FALSE;
             if (cd_number == g_current_media_number - 1) {
                 log_to_screen
                     ("I think you've left the previous %s in the drive.",
-                     media_descriptor_string(g_backup_media_type));
+                     g_backup_media_string);
             } else {
                 log_to_screen
                     ("Please remove this %s. It is part of the backup set you're making now.",
-                     media_descriptor_string(g_backup_media_type));
+                     g_backup_media_string);
             }
         } else {
@@ -2903 +2906 @@
         log_msg(2,
                 "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?",
-                media_descriptor_string(g_backup_media_type));
+                g_backup_media_string);
         if ((cdrw_device = interrogate_disk_currently_in_cdrw_drive(cdrw_device)) != NULL) {
             ok_go_ahead_burn_it = FALSE;
             log_to_screen("There isn't a writable %s in the drive.",
-                          media_descriptor_string(g_backup_media_type));
+                          g_backup_media_string);
         }
         paranoid_free(cdrw_device);
@@ -2917 +2920 @@
         asprintf(&tmp,
                  "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
-                 media_descriptor_string(g_backup_media_type),
+                 g_backup_media_string,
                  g_current_media_number,
-                 media_descriptor_string(g_backup_media_type));
+                 g_backup_media_string);
         popup_and_OK(tmp);
         paranoid_free(tmp);
@@ -2930 +2933 @@
     log_msg(2,
             "paafcd: OK, I assume I have a blank/reusable %s in the drive...",
-            media_descriptor_string(g_backup_media_type));
+            g_backup_media_string);
 
     log_to_screen("Proceeding w/ %s in drive.",
-                  media_descriptor_string(g_backup_media_type));
+                  g_backup_media_string);
     if (pmountable) {
         if (attempt_to_mount_returned_this) {
@@ -2994 +2997 @@
  */
 int
-slice_up_file_etc(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggie_filename,
+slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,
                   char *ntfsprog_fifo, long biggie_file_number,
                   long noof_biggie_files, bool use_ntfsprog)
@@ -3092 +3095 @@
     }
     lstat(biggie_filename, &biggiestruct.properties);
-    strcpy(biggiestruct.filename, biggie_filename);
+    if (strlen(checksum_line) <= MAX_STR_LEN) {
+        strcpy(biggiestruct.filename, biggie_filename);
+    } else {
+        fatal_error("biggie_filename too big");
+    }
     pB = strchr(checksum_line, ' ');
     if (!pB) {
@@ -3100 +3107 @@
         *pB = '\0';
     }
-    strcpy(biggiestruct.checksum, checksum_line);
+    if (strlen(checksum_line) <= 64) {
+        strcpy(biggiestruct.checksum, checksum_line);
+    } else {
+        fatal_error("checksum_line too big");
+    }
     paranoid_free(checksum_line);
 
@@ -3125 +3136 @@
         res = move_files_to_stream(bkpinfo,tmp,NULL);
     } else {
-        res = move_files_to_cd(bkpinfo, mrconf, tmp, NULL);
+        res = move_files_to_cd(bkpinfo, tmp, NULL);
     }
     paranoid_free(tmp);
@@ -3131 +3142 @@
     for (slice_num = 1; !finished; slice_num++) {
         curr_slice_fname_uncompressed = slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, "");
-        curr_slice_fname_compressed = slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix));
+        curr_slice_fname_compressed = slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix);
 
         tmp = percent_media_full_comment(bkpinfo);
@@ -3236 +3247 @@
             res = move_files_to_stream(bkpinfo, file_to_archive, NULL);
         } else {
-            res = move_files_to_cd(bkpinfo, mrconf, file_to_archive, NULL);
+            res = move_files_to_cd(bkpinfo, file_to_archive, NULL);
         }
         paranoid_free(file_to_archive);
@@ -3332 +3343 @@
  * however, this occurs rarely.
  */
-int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo)
 {
     /*@ int ***************************************************** */
@@ -3355 +3366 @@
 #endif
     paranoid_free(tmp);
-    res = write_iso_and_go_on(bkpinfo, mrconf, TRUE);
+    res = write_iso_and_go_on(bkpinfo, TRUE);
 #ifndef _XWIN
     if (!g_text_mode) {
@@ -3383 +3394 @@
  * @see make_iso_fs
  */
-int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, bool last_cd)
+int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd)
 {
     /*@ pointers **************************************************** */
@@ -3414 +3425 @@
     }
     log_msg(1, "OK, time to make %s #%d",
-            media_descriptor_string(bkpinfo->backup_media_type),
+            bkpinfo->backup_media_string,
             g_current_media_number);
 
@@ -3461 +3472 @@
              g_current_media_number);
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
-        res = make_iso_fs(bkpinfo, mrconf, isofile);
+        res = make_iso_fs(bkpinfo, isofile);
         if (g_current_media_number == 1 && !res
             && (bkpinfo->backup_media_type == cdr
@@ -3478 +3489 @@
             log_to_screen
                 ("Please reboot from the 1st %s in Compare Mode, as a precaution.",
-                 media_descriptor_string(g_backup_media_type));
+                 g_backup_media_string);
             chdir("/");
             iamhere("Before calling verify_cd_image()");
@@ -3488 +3499 @@
         } else {
             asprintf(&tmp, "Failed to burn %s #%d. Retry?",
-                     media_descriptor_string(bkpinfo->backup_media_type),
+                     bkpinfo->backup_media_string,
                      g_current_media_number);
             res = ask_me_yes_or_no(tmp);
@@ -3577 +3588 @@
         g_current_media_number = cdno;
         if (bkpinfo->backup_media_type != iso) {
-            bkpinfo->media_device = find_cdrom_device(FALSE));
+            bkpinfo->media_device = find_cdrom_device(FALSE);
         }
         chdir("/");
@@ -3595 +3606 @@
                 asprintf(&tmp,
                          "Warnings/errors were reported while checking %s #%d",
-                         media_descriptor_string(bkpinfo->
-                                                 backup_media_type),
+                         bkpinfo->backup_media_string,
                          g_current_media_number);
                 log_to_screen(tmp);
@@ -3745 +3755 @@
 }
 
-void mrarchive_init_conf(struct s_mrconf *mrconf) {
+void mr_archive_init_conf(struct s_mr_conf *mr_conf) {
     char *command = NULL;
-    FILE *conffd = NULL;
     FILE *fin = NULL;
-    int n = 0;
+    size_t n = 0;
     char *param = NULL;
 
-    mrconf = (struct s_mrconf *)malloc(sizeof(struct s_mrconf));
-    if (mrconf == NULL) {
-            fatal_error("Unable to malloc mrconf");
+    mr_conf = (struct s_mr_conf *)malloc(sizeof(struct s_mr_conf));
+    if (mr_conf == NULL) {
+            fatal_error("Unable to malloc mr_conf");
     }
     /* Default for everything int : 0 char * : NULL */
 
     /* mindi conf parameters also needed in mondo */
-    mrconf->ia64_boot_size = 0;
+    mr_conf->mindi_ia64_boot_size = 0;
 
     asprintf(&command, "mindi -printvar IA64_BOOT_SIZE");
@@ -3766 +3775 @@
     pclose(fin);
     paranoid_free(command);
-    mrconf->ia64_boot_size = atoi(param);
+    mr_conf->mindi_ia64_boot_size = atoi(param);
     paranoid_free(param);
 
-    mrconf->iso_creation_cmd = NULL;
+    mr_conf->mondo_iso_creation_cmd = NULL;
 
     /* Finds mondo conf file */
-    mrconf_open(MONDO_CONF_DIR"/mondo.conf");
+    mr_conf_open(MONDO_CONF_DIR"/mondo.conf");
 
     /* mondo conf parameters needed */
-    mrconf->iso_creation_cmd = mrconf_sread(iso_creation_cmd);
-
-    mrconf_close();
+    mr_conf->mondo_iso_creation_cmd = mr_conf_sread("mondo_iso_creation_cmd");
+
+    mr_conf_close();
+}

trunk/mondo/mondo/common/libmondo-archive.h

@@ -17 +17 @@
 int make_slices_and_images(struct s_bkpinfo *bkpinfo,
                            char *biggielist_fname);
-int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile);
+int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile);
 int make_afioballs_and_images(struct s_bkpinfo *bkpinfo);
 extern int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...);

trunk/mondo/mondo/common/libmondo-devices-EXT.h

@@ -33 +33 @@
                                                            *, bool);
 
-
-extern void make_fifo(char *store_name_here, char *stub);
-
-
 extern void insist_on_this_cd_number(struct s_bkpinfo *bkpinfo,
                                      int cd_number_i_want);
@@ -69 +65 @@
 
 extern char *which_partition_format(const char *drive);
+extern char *bkptype_to_string(t_bkptype bt);

trunk/mondo/mondo/common/libmondo-devices.c

@@ -63 +63 @@
     if (bkpinfo->media_device != NULL) {
         paranoid_alloc(g_cdrom_drive_is_here, bkpinfo->media_device);   // just in case
-    }
-    if (bkpinfo->media_device != NULL) {
         paranoid_alloc(g_dvd_drive_is_here, bkpinfo->media_device); // just in case
     }
@@ -95 +93 @@
     log_it("rctada: Unmounting all CD drives", __LINE__);
     run_program_and_log_output("umount /dev/cdr* /dev/dvd*", 5);
+}
+
+
+/**
+ * Mount the CD-ROM at @p mountpoint.
+ * @param device The device (or file if g_ISO_restore_mode) to mount.
+ * @param mountpoint The place to mount it.
+ * @return TRUE for success, FALSE for failure.
+ */
+bool mount_CDROM_here(char *device, char *mountpoint)
+{
+    /*@ buffer ****************************************************** */
+    char *command = NULL;
+    int retval = 0;
+
+    assert_string_is_neither_NULL_nor_zerolength(device);
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+
+    make_hole_for_dir(mountpoint);
+    if (isdigit(device[0])) {
+        paranoid_free(device);
+        device = find_cdrom_device(FALSE);
+    }
+    if (g_ISO_restore_mode) {
+
+#ifdef __FreeBSD__
+        char *dev = NULL;
+
+        dev = make_vn(device));
+        if (!dev) {
+            asprintf(&command, "Unable to mount ISO (make_vn(%s) failed)",
+                    device);
+            fatal_error(command);
+        }
+        paranoid_free(device);
+        device = dev;
+#endif
+    }
+
+    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
+            mountpoint);
+    /*@ end vars *************************************************** */
+
+#ifdef __FreeBSD__
+    asprintf(&command, "mount_cd9660 -r %s %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
+#else
+    asprintf(&command, "mount %s -o ro,loop -t iso9660 %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
+#endif
+
+    log_msg(4, command);
+    if (strncmp(device, "/dev/", 5) == 0) {
+        retract_CD_tray_and_defeat_autorun();
+    }
+    retval = system(command);
+    log_msg(1, "system(%s) returned %d", command, retval);
+    paranoid_free(command);
+
+    if (retval == 0) {
+        return(TRUE);
+    } else {
+        return(FALSE);
+    }
 }
 
@@ -1232 +1294 @@
 
 /**
- * Mount the CD-ROM at @p mountpoint.
- * @param device The device (or file if g_ISO_restore_mode) to mount.
- * @param mountpoint The place to mount it.
- * @return TRUE for success, FALSE for failure.
- */
-bool mount_CDROM_here(char *device, char *mountpoint)
-{
-    /*@ buffer ****************************************************** */
-    char *command = NULL;
-    int retval = 0;
-
-    assert_string_is_neither_NULL_nor_zerolength(device);
-    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
-
-    make_hole_for_dir(mountpoint);
-    if (isdigit(device[0])) {
-        paranoid_free(device);
-        device = find_cdrom_device(FALSE);
-    }
-    if (g_ISO_restore_mode) {
-
-#ifdef __FreeBSD__
-        char *dev = NULL;
-
-        dev = make_vn(device));
-        if (!dev) {
-            asprintf(&command, "Unable to mount ISO (make_vn(%s) failed)",
-                    device);
-            fatal_error(command);
-        }
-        paranoid_free(device);
-        device = dev;
-#endif
-    }
-
-    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
-            mountpoint);
-    /*@ end vars *************************************************** */
-
-#ifdef __FreeBSD__
-    asprintf(&command, "mount_cd9660 -r %s %s 2>> %s",
-            device, mountpoint, MONDO_LOGFILE);
-#else
-    asprintf(&command, "mount %s -o ro,loop -t iso9660 %s 2>> %s",
-            device, mountpoint, MONDO_LOGFILE);
-#endif
-
-    log_msg(4, command);
-    if (strncmp(device, "/dev/", 5) == 0) {
-        retract_CD_tray_and_defeat_autorun();
-    }
-    retval = system(command);
-    log_msg(1, "system(%s) returned %d", command, retval);
-    paranoid_free(command);
-
-    if (retval == 0) {
-        return(TRUE);
-    } else {
-        return(FALSE);
-    }
-}
-
-
-/**
  * Ask the user for CD number @p cd_number_i_want.
  * Sets g_current_media_number once the correct CD is inserted.
@@ -1355 +1353 @@
                         "FIXME - hacking bkpinfo->isodir from '%s' to /tmp/isodir",
                         bkpinfo->isodir);
-                strcpy(bkpinfo->isodir, "/tmp/isodir");
+                paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
             }
         }
@@ -1368 +1366 @@
                 cd_number_i_want);
         asprintf(&tmp, "Insisting on %s #%d",
-                media_descriptor_string(bkpinfo->backup_media_type),
+                bkpinfo->backup_media_string,
                 cd_number_i_want);
         asprintf(&request, "Please insert %s #%d and press Enter.",
-                media_descriptor_string(bkpinfo->backup_media_type),
+                bkpinfo->backup_media_string,
                 cd_number_i_want);
         log_msg(3, tmp);
@@ -1451 +1449 @@
         popup_and_OK(_("Please remove CD/floppy from drive(s)"));
     }
-    log_msg(3, "media type = %s",
-            bkptype_to_string(bkpinfo->backup_media_type));
+    bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
+    log_msg(3, "media type = %s",bkpinfo->backup_media_string);
+
     if (archiving_to_media) {
         sensibly_set_tmpdir_and_scratchdir(bkpinfo);
@@ -1496 +1495 @@
             }
             asprintf(&comment, _("What speed is your %s (re)writer?"),
-                    media_descriptor_string(bkpinfo->backup_media_type));
+                    bkpinfo->backup_media_string);
             if (bkpinfo->backup_media_type == dvd) {
+                paranoid_free(bkpinfo->media_device);
                 bkpinfo->media_device = find_dvd_device();
                 asprintf(&tmp, "1");
@@ -1521 +1521 @@
             asprintf(&comment,
                     _("How much data (in Megabytes) will each %s store?"),
-                    media_descriptor_string(bkpinfo->backup_media_type));
+                    bkpinfo->backup_media_string);
 
             if (!popup_and_get_string("Size", comment, sz_size)) {
@@ -1551 +1551 @@
             log_msg(1, "bkpinfo->media_device = %s",
                     bkpinfo->media_device);
+            tmp = find_cdrom_device(FALSE);
             if ((bkpinfo->backup_media_type == dvd)
-                || ((tmp = find_cdrom_device(FALSE)) != NULL)) {
-                paranoid_free(bkpinfo->media_device);
-                bkpinfo->media_device = tmp;
+                || (tmp != NULL)) {
+                paranoid_alloc(bkpinfo->media_device, tmp);
                 log_msg(1, "bkpinfo->media_device = %s",
                         bkpinfo->media_device);
                 asprintf(&comment,
                         _("Please specify your %s drive's /dev entry"),
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type));
+                        bkpinfo->backup_media_string);
                 if (!popup_and_get_string
                     (_("Device?"), comment, bkpinfo->media_device)) {
@@ -1568 +1567 @@
                 paranoid_free(comment);
             }
+            paranoid_free(tmp);
+
             log_msg(2, "%s device found at %s",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     bkpinfo->media_device);
         } else {
@@ -1576 +1577 @@
                 asprintf(&tmp,
                         _("I think I've found your %s burner at SCSI node %s; am I right on the money? Say no if you have an IDE burner and you are running a 2.6 kernel. Instead, specify the IDE burner's /dev address at the next screen."),
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type),
+                        bkpinfo->backup_media_string,
                         bkpinfo->media_device);
                 if (!ask_me_yes_or_no(tmp)) {
@@ -1628 +1628 @@
             } else {
                 if (does_file_exist("/tmp/mondo-restore.cfg")) {
+                    paranoid_free(bkpinfo->media_device);
                     read_cfg_var("/tmp/mondo-restore.cfg", "media-dev",
                                  bkpinfo->media_device);
@@ -1639 +1640 @@
             }
             paranoid_free(tmp);
-        }
-        if (bkpinfo->media_device == NULL) {
+        } else {
             if (!popup_and_get_string
                 (_("Device name?"),
@@ -1677 +1677 @@
 
     case nfs:
-        if (!bkpinfo->nfs_mount[0]) {
-            strcpy(bkpinfo->nfs_mount,
-                   call_program_and_get_last_line_of_output
-                   ("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
+        if (bkpinfo->nfs_mount == NULL) {
+            bkpinfo->nfs_mount = call_program_and_get_last_line_of_output
+                   ("mount | grep \":\" | cut -d' ' -f1 | head -n1");
         }
 #ifdef __FreeBSD__
@@ -1704 +1703 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
+            /* BERLIOS: Useless
             strip_spaces(bkpinfo->nfs_mount);
+            */
             if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
                 bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
             asprintf(&command, "mount | grep \"%s \" | cut -d' ' -f3",
                     bkpinfo->nfs_mount);
-            strcpy(bkpinfo->isodir,
-                   call_program_and_get_last_line_of_output(command));
+            paranoid_free(bkpinfo->isodir);
+            bkpinfo->isodir = call_program_and_get_last_line_of_output(command);
             paranoid_free(command);
 
@@ -1738 +1739 @@
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
-            sprintf(bkpinfo->isodir, "/tmp/isodir.mondo.%d",
+            paranoid_free(bkpinfo->isodir);
+            asprintf(&bkpinfo->isodir, "/tmp/isodir.mondo.%d",
                     (int) (random() % 32768));
             asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
@@ -1748 +1750 @@
             run_program_and_log_output(tmp, 5);
             paranoid_free(tmp);
-            malloc_string(g_selfmounted_isodir);
-            strcpy(g_selfmounted_isodir, bkpinfo->isodir);
+            asprintf(&g_selfmounted_isodir, bkpinfo->isodir);
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
@@ -1845 +1846 @@
     if (archiving_to_media) {
 
+        if (bkpinfo->boot_device) {
+            paranoid_free(bkpinfo->boot_device);
+        }
 #ifdef __FreeBSD__
         bkpinfo->boot_device = call_program_and_get_last_line_of_output
-               ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
+               ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'");
 #else
         bkpinfo->boot_device = call_program_and_get_last_line_of_output
-               ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+               ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
 #endif
         i = which_boot_loader(bkpinfo->boot_device);
@@ -1989 +1993 @@
     log_it("media device = %s", bkpinfo->media_device);
     log_it("media size = %ld", bkpinfo->media_size[1]);
-    log_it("media type = %s",
-           bkptype_to_string(bkpinfo->backup_media_type));
+    log_it("media type = %s", bkpinfo->backup_media_string);
+    paranoid_free(tmp);
     log_it("prefix = %s", bkpinfo->prefix);
     log_it("compression = %ld", bkpinfo->compression_level);
@@ -1999 +2003 @@
     log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device,
            bkpinfo->boot_loader);
-    log_it("prefix = %s", bkpinfo->prefix);
     if (bkpinfo->media_size[0] < 0) {
         if (archiving_to_media) {
@@ -2033 +2036 @@
 
 /**
- * Create a randomly-named FIFO. The format is @p stub "." [random] [random] where
- * [random] is a random number between 1 and 32767.
- * @param store_name_here Where to store the new filename.
- * @param stub A random number will be appended to this to make the FIFO's name.
- * @ingroup deviceGroup
- */
-void make_fifo(char *store_name_here, char *stub)
-{
-    char *tmp;
-
-    assert_string_is_neither_NULL_nor_zerolength(stub);
-
-    sprintf(store_name_here, "%s%d%d", stub, (int) (random() % 32768),
-            (int) (random() % 32768));
-    make_hole_for_file(store_name_here);
-    mkfifo(store_name_here, S_IRWXU | S_IRWXG);
-    asprintf(&tmp, "chmod 770 %s", store_name_here);
-    paranoid_system(tmp);
-    paranoid_free(tmp);
-}
-
-
-/**
  * Set the tmpdir and scratchdir to reside on the partition with the most free space.
  * Automatically excludes DOS, NTFS, SMB, and NFS filesystems.
@@ -2087 +2067 @@
     }
     i = (int) (random() % 32768);
+    paranoid_free(bkpinfo->tmpdir);
     asprintf(&bkpinfo->tmpdir, "%s/mondo.tmp.%d", tmp, i);
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
 
+    paranoid_free(bkpinfo->scratchdir);
     asprintf(&bkpinfo->scratchdir, "%s/mondo.scratch.%d", tmp, i);
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
@@ -2277 +2259 @@
 
 char which_boot_loader(char *which_device)
+        /* which_device is allocated here and needs to be freed by caller */
 {
     /*@ buffer ***************************************************** */
@@ -2315 +2298 @@
         if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
             count_grubs++;
-            strcpy(which_device, current_drive);
+            paranoid_alloc(which_device,current_drive);
             break;
         }
         if (does_string_exist_in_boot_block(current_drive, "LILO")) {
             count_lilos++;
-            strcpy(which_device, current_drive);
+            paranoid_alloc(which_device,current_drive);
             break;
         }
     }
-    paranoid_free(current_drive);
 
     if (pclose(pdrives)) {

trunk/mondo/mondo/common/libmondo-devices.h

@@ -7 +7 @@
 int does_partition_exist(const char *drive, int partno);
 bool does_string_exist_in_boot_block(char *dev, char *str);
-int find_and_mount_actual_cd(struct s_bkpinfo *bkpinfo, char *mountpoint);
+bool find_and_mount_actual_cd(struct s_bkpinfo *bkpinfo, char *mountpoint);
 char *find_cdrom_device(bool try_to_mount);
 char *find_dvd_device(void);
@@ -28 +28 @@
 
 
-
-void make_fifo(char *store_name_here, char *stub);
 
 void insist_on_this_cd_number(struct s_bkpinfo *bkpinfo,
@@ -58 +56 @@
 
 char *which_partition_format(const char *drive);
+char *bkptype_to_string(t_bkptype bt);

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -266 +266 @@
             i = 0;
         }
-        /* BERLIOS: Useless with getline
-           if (i > MAX_STR_LEN - 1) {
-           incoming[MAX_STR_LEN - 30] = '\0';
-           log_msg(1, "Warning - truncating file %s's name", incoming);
-           err++;
-           }
-         */
         if (incoming[i] < 32) {
             incoming[i] = '\0';
@@ -717 +710 @@
 {
     /*@ buffers ***************************************************** */
-    char val_sz[MAX_STR_LEN];
-    char *cfg_fname;
+    char *val_sz = NULL;
+    char *cfg_fname = NULL;
 
     /*@ long ******************************************************** */
-    int val_i;
+    int val_i = 0;
 
     /*@ end vars **************************************************** */
@@ -730 +723 @@
     read_cfg_var(cfg_fname, "last-filelist-number", val_sz);
     val_i = atoi(val_sz);
+    paranoid_free(val_sz);
+
     if (val_i <= 0) {
         val_i = 500;
@@ -1356 +1351 @@
         asprintf(&tmp,
                 "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
-                 dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
+                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
         asprintf(&tmp,
                 "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
-                 dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
+                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
 #endif
         system(tmp);
@@ -1435 +1430 @@
             /* BERLIOS: Old code
                new_with_spaces[0] = ' ';
-               strcpy(new_with_spaces + 1, new);
-               strcat(new_with_spaces, " ");
+               str-cpy(new_with_spaces + 1, new);
+               str-cat(new_with_spaces, " ");
              */
             if (strstr(skip_these, new_with_spaces)) {
@@ -1504 +1499 @@
 {
     static char sz_res[MAX_STR_LEN];
-    char *p;
+    char *p = NULL;
     bool in_quotes = FALSE;
 

trunk/mondo/mondo/common/libmondo-files-EXT.h

@@ -7 +7 @@
 extern unsigned int updcrcr(unsigned int crc, unsigned int c);
 extern char *calc_checksum_of_file(char *filename);
-extern char *calc_file_ugly_minichecksum(char *curr_fname);
 extern long count_lines_in_file(char *filename);
 extern bool does_file_exist(char *filename);

trunk/mondo/mondo/common/libmondo-files.c

@@ -25 +25 @@
 
 extern int g_currentY;
+extern int g_noof_log_lines;
 extern char *g_mondo_home;
 
@@ -77 +78 @@
     }
     return (output);
-}
-
-
-/**
- * Get a not-quite-unique representation of some of the file's @c stat properties.
- * The returned string has the form <tt>size-mtime-ctime</tt>.
- * @param curr_fname The file to generate the "checksum" for.
- * @return The "checksum".
- * @note The returned string points to static storage that will be overwritten with each call.
- */
-char *calc_file_ugly_minichecksum(char *curr_fname)
-{
-
-    /*@ buffers ***************************************************** */
-    char *curr_cksum;
-
-    /*@ pointers **************************************************** */
-
-    /*@ structures ************************************************** */
-    struct stat buf;
-
-    /*@************************************************************** */
-
-    assert_string_is_neither_NULL_nor_zerolength(curr_fname);
-    if (lstat(curr_fname, &buf)) {
-        asprintf(&curr_cksum, "");
-    } else {
-        asprintf(&curr_cksum, "%ld-%ld-%ld", (long) (buf.st_size),
-            (long) (buf.st_mtime), (long) (buf.st_ctime));
-    }
-    return (curr_cksum);
 }
 
@@ -275 +245 @@
     if (kernel == NULL) {
         kernel = call_program_and_get_last_line_of_output
-               ("mindi --findkernel 2> /dev/null"));
+               ("mindi --findkernel 2> /dev/null");
     }
     // If we didn't get anything back, check whether mindi raised a fatal error
@@ -481 +451 @@
         log_it(tmp);
         paranoid_free(tmp);
-        asprintf(&output, "");
-
-        return (output);
+        return (NULL);
     }
     asprintf(&command, "tail -n1 %s", filename);
@@ -1033 +1001 @@
     paranoid_free(command);
 
-    if (bkpinfo->postnuke_tarball[0]) {
+    if (bkpinfo->postnuke_tarball) {
         asprintf(&command, "cp -f %s %s/post-nuke.tgz",
                 bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
@@ -1187 +1155 @@
 {
     /*@ buffers *************** */
-    char *tmp;
+    char *tmp = NULL;
 
     /*@ long long ************* */
@@ -1214 +1182 @@
         asprintf(&tmp,
                 _("Your backup will probably occupy a single %s. Maybe two."),
-                media_descriptor_string(bkpinfo->backup_media_type));
+                bkpinfo->backup_media_string);
     } else {
         asprintf(&tmp, _("Your backup will occupy approximately %s media."),
                 number_to_text((int) (scratchLL + 1)));
     }
-    if (!bkpinfo->image_devs[0] && (scratchLL < 50)) {
+    if (!bkpinfo->image_devs && (scratchLL < 50)) {
         log_to_screen(tmp);
     }
@@ -1235 +1203 @@
 bool is_this_file_compressed(char *filename)
 {
-    char *do_not_compress_these;
-    char *tmp;
-    char *p;
+    char *do_not_compress_these = NULL;
+    char *tmp = NULL;
+    char *p = NULL;
 
     asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);

trunk/mondo/mondo/common/libmondo-files.h

@@ -9 +9 @@
 unsigned int updcrcr(unsigned int crc, unsigned int c);
 char *calc_checksum_of_file(char *filename);
-char *calc_file_ugly_minichecksum(char *curr_fname);
-char *calc_file_ugly_minichecksum(char *curr_fname);
 long count_lines_in_file(char *filename);
 bool does_file_exist(char *filename);

trunk/mondo/mondo/common/libmondo-fork.c

@@ -11 +11 @@
 #include "libmondo-tools-EXT.h"
 
-extern char *g_tmpfs_mountpt;
-extern t_bkptype g_backup_media_type;
 extern bool g_text_mode;
 pid_t g_buffer_pid = 0;
@@ -107 +105 @@
     log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
             what_i_am_doing);
-    strcpy(tmp, command);
     if (bkpinfo->manual_cd_tray) {
-        p = strstr(tmp, "2>>");
+        /* Find everything after a 2>> and remove it */
+        p = strstr(command, "2>>");
         if (p) {
-            sprintf(p, "   ");
-            while (*p == ' ') {
-                p++;
-            }
-            for (; *p != ' '; p++) {
+            for (; *p != ' ' && *p != '\0'; p++) {
                 *p = ' ';
             }
         }
-        paranoid_free(command);
-        asprintf(&command, tmp);
 #ifndef _XWIN
         if (!g_text_mode) {
@@ -164 +156 @@
 {
     /*@ buffer ****************************************************** */
-    char *callstr;
+    char *callstr = NULL;
     char *incoming = NULL;
-    char tmp[MAX_STR_LEN * 2];
 
     /*@ int ********************************************************* */
-    int res;
-    int i;
+    int res = 0;
     size_t n = 0;
-    int len;
     bool log_if_failure = FALSE;
     bool log_if_success = FALSE;
@@ -203 +192 @@
 
 
-    len = (int) strlen(program);
-    for (i = 0; i < 35 - len / 2; i++) {
-        tmp[i] = '-';
-    }
-    tmp[i] = '\0';
-    strcat(tmp, " ");
-    strcat(tmp, program);
-    strcat(tmp, " ");
-    for (i = 0; i < 35 - len / 2; i++) {
-        strcat(tmp, "-");
-    }
     res = system(callstr);
     if (((res == 0) && log_if_success) || ((res != 0) && log_if_failure)) {
@@ -361 +339 @@
 // if dir=='w' then copy from orig to archived
 // if dir=='r' then copy from archived to orig
-    char *tmp;
-    char *buf;
+    char *tmp = NULL;
+    char *buf = NULL;
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
         0, bufcap, subsliceno = 0;
     int retval = 0;
-    FILE *fin;
-    FILE *fout;
-    FILE *ftmp;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
+    FILE *ftmp = NULL;
 
     log_msg(5, "Opening.");
@@ -439 +417 @@
             }
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp, 1, 64L, fin) != 64L) {
                 fatal_error("Cannot read post-thingy block");
             }
@@ -448 +426 @@
             log_msg(7, "Subslice #%ld read OK", subsliceno);
             subsliceno++;
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp, 1, 64L, fin) != 64L) {
                 fatal_error("Cannot read introductory block");
             }
@@ -458 +436 @@
 
     if (direction == 'w') {
+        paranoid_free(tmp);
         asprintf(&tmp, "%-64s", PIMP_END_SZ);
-        if (fwrite(tmp, 1, 64, fout) != 64) {
+        if (fwrite(tmp, 1, 64L, fout) != 64L) {
             fatal_error("Can't write the final block");
         }
@@ -466 +445 @@
         log_msg(1, "tmpA is %s", tmp);
         if (!strstr(tmp, PIMP_END_SZ)) {
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp, 1, 64L, fin) != 64L) {
                 fatal_error("Can't read the final block");
             }
@@ -472 +451 @@
             if (!strstr(tmp, PIMP_END_SZ)) {
                 ftmp = fopen("/tmp/out.leftover", "w");
-                bytes_read_in = fread(tmp, 1, 64, fin);
+                bytes_read_in = fread(tmp, 1, 64L, fin);
                 log_msg(1, "bytes_read_in = %ld", bytes_read_in);
 //      if (bytes_read_in!=128+64) { fatal_error("Can't read the terminating block"); }
                 fwrite(tmp, 1, bytes_read_in, ftmp);
+                
                 paranoid_free(tmp);
-                
                 if (!(tmp = malloc(512))) {
                     fatal_error("Failed to malloc() tmp");
                 }
                 /* BERLIOS : strange ???
-                sprintf(tmp, "I am here - %llu", ftello(fin));
-      log_msg(0, tmp);
-*/
+                s-printf(tmp, "I am here - %llu", ftello(fin));
+                log_msg(0, tmp);
+                */
                 fread(tmp, 1, 512, fin);
                 log_msg(0, "tmp = '%s'", tmp);
@@ -571 +550 @@
         if (pcno <= 5 && last_pcno > 40) {
             close_evalcall_form();
-            open_evalcall_form("_(Verifying..."));
+            open_evalcall_form("_(Verifying...");
         }
         last_pcno = pcno;

trunk/mondo/mondo/common/libmondo-mountlist.c

@@ -63 +63 @@
     char *tmp1 = NULL;
     char *device = NULL;
+    char *ndevice = NULL;
     // BERLIOS : useless ? char *mountpoint;
 
@@ -203 +204 @@
         npos = 0;
         for (cur_sp_no = 'a'; cur_sp_no <= 'h'; cur_sp_no++) {
-            sprintf(device, "%ss%i%c", device, curr_part_no, cur_sp_no);
-            if (find_device_in_mountlist(mountlist, device) >= 0)
+            asprintf(&ndevice, "%ss%d%c", device, curr_part_no, cur_sp_no);
+            if (find_device_in_mountlist(mountlist, ndevice) >= 0)
                 npos++;
+            paranoid_free(ndevice);
         }
         paranoid_free(device);
@@ -500 +502 @@
 
     /*@ buffers ******************************************************** */
-    char *tmp;
-    char *device;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *device = NULL;
 
     /*@ long *********************************************************** */
-    long physical_drive_size = 0;
-    long amount_allocated = 0;
+    long physical_drive_size = 0L;
+    long amount_allocated = 0L;
 
     /*@ pointers ******************************************************* */
-    char *part_table_fmt;
+    char *part_table_fmt = NULL;
 
     /*@ initialize ***************************************************** */
@@ -559 +562 @@
             continue;
         }
-        // BERLIOS : useless ? strcpy(mountpoint, mountlist->el[pos].mountpoint);
+        // BERLIOS : useless ? str-cpy(mountpoint, mountlist->el[pos].mountpoint);
         /* gap in the partition list? */
         if (curr_part_no - prev_part_no > 1) {
@@ -751 +754 @@
     drivelist = malloc(sizeof(struct list_of_disks));
     assert(mountlist != NULL);
-    assert(flaws_str_A != NULL);
-    assert(flaws_str_B != NULL);
-    assert(flaws_str_C != NULL);
 
     asprintf(&flaws_str, " ");

trunk/mondo/mondo/common/libmondo-msg.c

@@ -14 +14 @@
  * The default maximum level to log messages at or below.
  */
-int g_loglevel = DEFAULT_DEBUG_LEVEL;
+extern int g_loglevel;
 
 /**

trunk/mondo/mondo/common/libmondo-raid.c

@@ -9 +9 @@
 
 #include "my-stuff.h"
+#include "mr_string.h"
 #include "mondostructures.h"
 #include "newt-specific-EXT.h"
@@ -177 +178 @@
 {
     /*@ buffers ***************************************************** */
-    char *sz_value;
+    char *sz_value = NULL;
+    char *sz_label = NULL;
 
     assert(raidrec != NULL);
@@ -183 +185 @@
 
     asprintf(&sz_value, "%d", value);
-    strcpy(raidrec->additional_vars.el[lino].label, label);
-    strcpy(raidrec->additional_vars.el[lino].value, sz_value);
-    paranoid_free(sz_value);
+    asprintf(&sz_label,label);
+    raidrec->additional_vars.el[lino].value = sz_value;
+    raidrec->additional_vars.el[lino].label = sz_label;
 }
 #endif
@@ -956 +958 @@
     // trim leading spaces
     pos = string;
-    while (*pos == ' ') pos += 1;
+    while (*pos == ' ') pos++;
     asprintf(&strtmp, pos);
-    strcpy(string, strtmp);
+    paranoid_alloc(string,strtmp);
     paranoid_free(strtmp);
     // if we have newline after only spaces, this is a blank line, update
@@ -979 +981 @@
     // get RAID device name
     asprintf(&strtmp,"%s%s", device_prefix, token);
-    strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
-    paranoid_free(strtmp);
+    raidlist->el[raidlist->entries].raid_device = strtmp;
     paranoid_free(token);
     // skip ':' and status

trunk/mondo/mondo/common/libmondo-stream.c

@@ -543 +543 @@
 
 
-/**
- * FIFO used to read/write to the tape device.
- * @bug This seems obsolete now that we call an external @c buffer program. Please look onto this.
- */
-char g_tape_fifo[MAX_STR_LEN];
-
 int set_tape_block_size_with_mt(char *tapedev,
                                 long internal_tape_block_size)
@@ -622 +616 @@
          open_device_via_buffer(bkpinfo->media_device, 'r',
                                 bkpinfo->internal_tape_block_size))) {
-        log_OS_error(g_tape_fifo);
         log_to_screen(_("Cannot openin stream device"));
         return (1);
@@ -748 +741 @@
         (g_tape_stream =
          open_device_via_buffer(tapedev, 'w', internal_tape_block_size))) {
-        log_OS_error(g_tape_fifo);
         log_to_screen(_("Cannot openin stream device"));
         return (1);
@@ -1249 +1241 @@
          open_device_via_buffer(bkpinfo->media_device, 'r',
                                 bkpinfo->internal_tape_block_size))) {
-        log_OS_error(g_tape_fifo);
         log_to_screen(_("Cannot openin stream device"));
         return (1);
@@ -1309 +1300 @@
              open_device_via_buffer(bkpinfo->media_device, 'w',
                                     bkpinfo->internal_tape_block_size))) {
-            log_OS_error(g_tape_fifo);
             log_to_screen(_("Cannot openin stream device"));
             return (1);

trunk/mondo/mondo/common/libmondo-string-EXT.h

@@ -3 +3 @@
  */
 
-extern char *build_partition_name(char *partition, const char *drive,
-                                  int partno);
+extern char *build_partition_name(const char *drive, int partno);
 extern void center_string(char *in_out, int width);
 extern char *commarize(char *);
@@ -44 +43 @@
 extern inline void turn_wildcard_chars_into_literal_chars(char *out,
                                                           char *in);
-/* Valid external functions */
-extern char *mr_strtok(char *instr, const char *delims, int *lastpos);

trunk/mondo/mondo/common/libmondo-string.c

@@ -14 +14 @@
 #include "newt-specific-EXT.h"
 #include "libmondo-tools-EXT.h"
+#include <math.h>
 
 /*@unused@*/
@@ -136 +137 @@
 
 
-/*
- * Add commas every third place in @p input.
- * @param input The string to commarize.
- * @return The string with commas.
- * @note The returned string points to static storage that will be overwritten with each call.
- */
-char *commarize(char *input)
-{
-    char *pos_w_commas;
-    static char output[MAX_STR_LEN];
-    char *tmp;
-    int j;
-
-    assert(input != NULL);
-
-    asprintf(&tmp, "%s", input);
-    if (strlen(tmp) > 6) {
-        asprintf(&pos_w_commas, "%s", tmp);
-        j = (int) strlen(pos_w_commas);
-        tmp[j - 6] = ',';
-        strcpy(tmp + j - 5, pos_w_commas + j - 6);
-        paranoid_free(pos_w_commas);
-        asprintf(&pos_w_commas, "%s", tmp);
-    }
-    if (strlen(tmp) > 3) {
-        j = (int) strlen(tmp);
-        asprintf(&pos_w_commas, "%s", tmp);
-        pos_w_commas[j - 3] = ',';
-        strcpy(pos_w_commas + j - 2, tmp + j - 3);
-    } else {
-        asprintf(&pos_w_commas, "%s", tmp);
-    }
-    strcpy(output, pos_w_commas);
-    paranoid_free(pos_w_commas);
-    paranoid_free(tmp);
-    return (output);
-}
-
-
 /**
  * Turn an entry from the RAID editor's disklist into a GUI-friendly string.
@@ -601 +563 @@
 
     /*@ initialize ****************************************************** */
-    assert(flaws_str_A != NULL);
-    assert(flaws_str_B != NULL);
-    assert(flaws_str_C != NULL);
     assert(flaws_str != NULL);
 
-    flaws_str_A[0] = flaws_str_B[0] = flaws_str_C[0] = '\0';
-
+    flaws_str_A = NULL;
+    flaws_str_B = NULL;
+    flaws_str_C = NULL;
 
     if (!res && !strlen(flaws_str)) {
@@ -613 +573 @@
     }
     if (strlen(flaws_str) > 0) {
-        sprintf(flaws_str_A, "%s", flaws_str + 1);
+        asprintf(&flaws_str_A, "%s", flaws_str + 1);
     }
     if (strlen(flaws_str_A) >= 74) {
         for (i = 74; flaws_str_A[i] != ' '; i--);
-        strcpy(flaws_str_B, flaws_str_A + i + 1);
+        asprintf(&flaws_str_B, "%s", flaws_str_A + i + 1);
         flaws_str_A[i] = '\0';
     }
     if (strlen(flaws_str_B) >= 74) {
         for (i = 74; flaws_str_B[i] != ' '; i--);
-        strcpy(flaws_str_C, flaws_str_B + i + 1);
+        asprintf(&flaws_str_C, "%s", flaws_str_B + i + 1);
         flaws_str_B[i] = '\0';
     }
@@ -834 +794 @@
     if (c && strncmp(c, "/part", 5) == 0) {
         /* yup it's devfs, return the "disc" path */
-        strcpy(c + 1, "disc");
+        strncpy(c + 1, "disc", (size_t)5);
         return partition;
     }
@@ -1027 +987 @@
     /*@ int *********************************************** */
     int percentage = 0;
-    int i;
-    int j;
+    int i = 0;
+    int j = 0;
 
     /*@ buffers ******************************************* */
-    char *outstr;
-    char *tmp;
-    char *tmp1;
-    char *tmp2;
-    char *prepstr;
-    char *p;
+    char *outstr = NULL;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
+    char *prepstr = NULL;
+    char *p = NULL;
 
     assert(bkpinfo != NULL);
 
     if (bkpinfo->media_size[g_current_media_number] <= 0) {
-        asprintf(&tmp, "%lld", g_tape_posK);
-        asprintf(&outstr, _("Volume %d: %s kilobytes archived so far"),
-                 g_current_media_number, commarize(tmp));
-        paranoid_free(tmp);
+        asprintf(&outstr, _("Volume %d: %'lld kilobytes archived so far"),
+                 g_current_media_number, g_tape_posK);
 
         return (outstr);
@@ -1060 +1017 @@
                    bkpinfo->media_size[g_current_media_number]);
         asprintf(&prepstr, "%s %d: [",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
     }
@@ -1093 +1050 @@
     return (outstr);
 }
-
-/**
- * Get a string form of @p type_of_bkp.
- * @param type_of_bkp The backup type to stringify.
- * @return The stringification of @p type_of_bkp.
- * @note The returned string points to static storage that will be overwritten with each call.
- */
-char *media_descriptor_string(t_bkptype type_of_bkp)
-{
-    static char *type_of_backup = NULL;
-
-    if (!type_of_backup) {
-        malloc_string(type_of_backup);
-    }
-
-    switch (type_of_bkp) {
-    case dvd:
-        strcpy(type_of_backup, "DVD");
-        break;
-    case cdr:
-        strcpy(type_of_backup, "CDR");
-        break;
-    case cdrw:
-        strcpy(type_of_backup, "CDRW");
-        break;
-    case tape:
-        strcpy(type_of_backup, "tape");
-        break;
-    case cdstream:
-        strcpy(type_of_backup, "CDR");
-        break;
-    case udev:
-        strcpy(type_of_backup, "udev");
-        break;
-    case iso:
-        strcpy(type_of_backup, "ISO");
-        break;
-    case nfs:
-        strcpy(type_of_backup, "nfs");
-        break;
-    default:
-        strcpy(type_of_backup, "ISO");
-    }
-    return (type_of_backup);
-}

trunk/mondo/mondo/common/libmondo-string.h

@@ -3 +3 @@
  */
 
-char *build_partition_name(char *partition, const char *drive, int partno);
+char *build_partition_name(const char *drive, int partno);
 void center_string(char *in_out, int width);
 char *commarize(char *);
@@ -34 +34 @@
 char *media_descriptor_string(t_bkptype);
 inline void turn_wildcard_chars_into_literal_chars(char *out, char *in);
-
-/* Valid external functions */
-char *mr_strtok(char *instr, const char *delims, int *lastpos);

trunk/mondo/mondo/common/libmondo-tools.c

@@ -74 +74 @@
 
 extern t_bkptype g_backup_media_type;
+extern char *g_backup_media_string;
 
 extern bool am_I_in_disaster_recovery_mode(void);
@@ -281 +282 @@
 {
     assert(raidrec != NULL);
-    raidrec->raid_device[0] = '\0';
+    raidrec->raid_device = NULL;
     raidrec->raid_level = -9;
     raidrec->persistent_superblock = 1;
@@ -356 +357 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
-    char call_before_iso_user[MAX_STR_LEN] = "\0";
+    char *call_before_iso_user = NULL;
     int rdsiz_MB;
     char *iso_path = NULL;
@@ -415 +416 @@
     if (avm / 1024 > rdsiz_MB * 3) {
         if (run_program_and_log_output(command, 5)) {
-            g_tmpfs_mountpt[0] = '\0';
+            paranoid_free(g_tmpfs_mountpt);
             log_it("Failed to mount tmpfs");
         } else {
@@ -421 +422 @@
         }
     } else {
-        g_tmpfs_mountpt[0] = '\0';
+        paranoid_free(g_tmpfs_mountpt);
         log_it("It doesn't seem you have enough swap to use tmpfs. Fine.");
     }
@@ -427 +428 @@
 
     if (bkpinfo->use_lzo) {
-        strcpy(bkpinfo->zip_exe, "lzop");
-        strcpy(bkpinfo->zip_suffix, "lzo");
+        paranoid_alloc(bkpinfo->zip_exe, "lzop");
+        paranoid_alloc(bkpinfo->zip_suffix, "lzo");
     } else if (bkpinfo->compression_level != 0) {
-        strcpy(bkpinfo->zip_exe, "bzip2");
-        strcpy(bkpinfo->zip_suffix, "bz2");
+        paranoid_alloc(bkpinfo->zip_exe, "bzip2");
+        paranoid_alloc(bkpinfo->zip_suffix, "bz2");
     } else {
-        bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+        bkpinfo->zip_exe = NULL;
+        bkpinfo->zip_suffix = NULL;
     }
 
@@ -470 +472 @@
             // -m isn't supported by growisofs, BTW...
         } else {
-            sprintf(bkpinfo->call_make_iso,
+            asprintf(&bkpinfo->call_make_iso,
                     "%s %s -Z %s . 2>> _ERR_",
                     mondo_mkisofs_sz, "", bkpinfo->media_device);
@@ -518 +520 @@
 
         if (bkpinfo->nonbootable_backup) {
-            asprintf(&mondo_mkisofs_sz, "%s -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_", mrconf->mondo_iso_creation_cmd);
+            asprintf(&mondo_mkisofs_sz, "%s -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_", bkpinfo->mr_conf->mondo_iso_creation_cmd);
         } else if
 #ifdef __FreeBSD__
@@ -539 +541 @@
         }
         if (bkpinfo->manual_cd_tray) {
-            if (bkpinfo->call_before_iso[0] == '\0') {
-            sprintf(bkpinfo->call_before_iso,
+            if (bkpinfo->call_before_iso == NULL) {
+                asprintf(&bkpinfo->call_before_iso,
                         "%s -o %s/temporary.iso . 2>> _ERR_",
                         mondo_mkisofs_sz, bkpinfo->tmpdir);
-                } else {
-                strncpy(call_before_iso_user, bkpinfo->call_before_iso, MAX_STR_LEN);
-                sprintf (bkpinfo->call_before_iso,
+            } else {
+                asprintf(&call_before_iso_user, bkpinfo->call_before_iso);
+                asprintf(&bkpinfo->call_before_iso,
                                     "( %s -o %s/temporary.iso . 2>> _ERR_ ; %s )",
                         mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
+                paranoid_free(call_before_iso_user);
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
-            sprintf(bkpinfo->call_make_iso,
+            asprintf(&bkpinfo->call_make_iso,
                     "%s %s -v %s fs=4m dev=%s speed=%d %s/temporary.iso",
                     cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject",
@@ -556 +559 @@
                     bkpinfo->cdrw_speed, bkpinfo->tmpdir);
         } else {
-            sprintf(bkpinfo->call_make_iso,
+            asprintf(&bkpinfo->call_make_iso,
                     "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -",
                     mondo_mkisofs_sz, cdr_exe,
@@ -641 +644 @@
                                                           h_addr)),
                          strchr(bkpinfo->nfs_mount, ':'));
-                strcpy(bkpinfo->nfs_mount, ip_address);
+                paranoid_alloc(bkpinfo->nfs_mount, ip_address);
                 paranoid_free(ip_address);
             }
@@ -663 +666 @@
         retval++;
     }
-    if (bkpinfo->include_paths[0] == '\0') {
+    if (bkpinfo->include_paths == NULL) {
         //      fatal_error ("Why no backup path?");
-        strcpy(bkpinfo->include_paths, "/");
+        asprintf(&bkpinfo->include_paths, "/");
     }
     chmod(bkpinfo->scratchdir, 0700);
     chmod(bkpinfo->tmpdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
+    paranoid_alloc(g_backup_media_string,bkpinfo->backup_media_string);
     return (retval);
 }
@@ -712 +716 @@
     g_current_media_number = 1;
     bkpinfo->postnuke_tarball = NULL;
-    bkpinfo->nfs_mount = NULL;
+    paranoid_free(bkpinfo->nfs_mount);
     return (res);
 }
@@ -748 +752 @@
     paranoid_free(bkpinfo->restore_path);
     bkpinfo->use_lzo = FALSE;
-    paranoid_free(bkpinfo->do_not_compress_these);
     bkpinfo->verify_data = FALSE;
     bkpinfo->backup_data = FALSE;
@@ -767 +770 @@
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
+    paranoid_free(bkpinfo->backup_media_string);
     paranoid_alloc(bkpinfo->include_paths, "/");
     paranoid_free(bkpinfo->exclude_paths);
@@ -1043 +1047 @@
         value = NULL;
         return (1);
-    } else if (strstr(value, "/dev/") && strstr(value, "t0")
+    /* } BERLIOS: Useless: 
+         else if (strstr(value, "/dev/") && strstr(value, "t0")
                && !strcmp(label, "media-dev")) {
         log_msg(2, "FYI, I shan't read new value for %s - already got %s",
                 label, value);
         return (0);
-    } else {
+    */ } else {
         asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
                 label, config_file);
@@ -1102 +1107 @@
 
     log_msg(1, "Started sub");
-    log_msg(4, "About to set g_boot_mountpt to \"\"");
-    asprintf(&g_boot_mountpt, "");
-    log_msg(4, "Done. Great. Seeting command to something");
+    log_msg(4, "Setting command to something");
     asprintf(&command,
              "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
@@ -1136 +1139 @@
                 asprintf(&tmp1, "mount %s", g_boot_mountpt);
                 if (run_program_and_log_output(tmp1, 5)) {
+                    /* BERLIOS: Useless ???
                     paranoid_free(g_boot_mountpt);
                     asprintf(&g_boot_mountpt, " ");
+                    */
                     log_msg(1, "Plan B");
                     if (!run_program_and_log_output("mount /boot", 5)) {
@@ -1166 +1171 @@
 
     log_msg(3, "starting");
-    if (g_boot_mountpt[0]) {
+    if (g_boot_mountpt != NULL) {
         asprintf(&tmp, "umount %s", g_boot_mountpt);
         if (run_program_and_log_output(tmp, 5)) {

trunk/mondo/mondo/common/libmondo-verify.c

@@ -63 +63 @@
     sync();
 
-/*  sprintf (command,
+/*  s-printf (command,
        "grep \"afio: \" %s | awk '{j=substr($0,8); i=index(j,\": \");printf \"/%%s\\n\",substr(j,1,i-2);}' | sort -u | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"/dev/.*\" > %s",
        stderr_fname, afio_found_changes);
@@ -152 +152 @@
     }
     asprintf(&tmp, "Verifying %s #%d's tarballs",
-             media_descriptor_string(bkpinfo->backup_media_type),
+             bkpinfo->backup_media_string,
              g_current_media_number);
     open_evalcall_form(tmp);
@@ -187 +187 @@
  * - @c restore_path
  * - @c use_lzo
- * - @c zip_exe
  * - @c zip_suffix
  * @param mtpt The mountpoint the CD/DVD/ISO is mounted on.
@@ -245 +244 @@
     iamhere("before vsbf");
     asprintf(&tmp, "Verifying %s#%d's big files",
-             media_descriptor_string(bkpinfo->backup_media_type),
+             bkpinfo->backup_media_string,
              g_current_media_number);
     open_evalcall_form(tmp);
@@ -391 +390 @@
     /*@ long *********************************************************** */
     long diffs = 0;
-    /*  getcwd(old_pwd,MAX_STR_LEN-1); */
 
     assert(bkpinfo != NULL);
@@ -405 +403 @@
         && strcmp(bkpinfo->zip_suffix, "lzo")) {
         log_msg(2, "OK, I'm going to start using lzop.");
-        strcpy(bkpinfo->zip_exe, "lzop");
-        strcpy(bkpinfo->zip_suffix, "lzo");
+        paranoid_alloc(bkpinfo->zip_exe, "lzop");
+        paranoid_alloc(bkpinfo->zip_suffix, "lzo");
         bkpinfo->use_lzo = TRUE;
     }
@@ -412 +410 @@
         && strcmp(bkpinfo->zip_suffix, "bz2")) {
         log_msg(2, "OK, I'm going to start using bzip2.");
-        strcpy(bkpinfo->zip_exe, "bzip2");
-        strcpy(bkpinfo->zip_suffix, "bz2");
+        paranoid_alloc(bkpinfo->zip_exe, "bzip2");
+        paranoid_alloc(bkpinfo->zip_suffix, "bz2");
         bkpinfo->use_lzo = FALSE;
     }
@@ -478 +476 @@
 
     /*  chdir(old_pwd); */
-    //  sprintf (tmp, "uniq -u %s >> %s", "/tmp/mondo-verify.err", MONDO_LOGFILE);
+    //  s-printf (tmp, "uniq -u %s >> %s", "/tmp/mondo-verify.err", MONDO_LOGFILE);
     //  paranoid_system (tmp);
     //  unlink ("/tmp/mondo-verify.err");

trunk/mondo/mondo/common/mondostructures.h

@@ -88 +88 @@
    * The label for this RAID variable.
    */
-    char label[64];
+    char *label;
 
   /**
    * The value for this RAID variable.
    */
-    char value[64];
+    char *value;
 };
 
@@ -214 +214 @@
        * The name of the RAID device (e.g. /dev/md0).
        */
-    char raid_device[64];
+    char *raid_device;
 
       /**
@@ -303 +303 @@
  */
 struct s_bkpinfo {
+
+  /** 
+   * Pointer to the configuration structure
+   */
+    struct s_mr_conf *mr_conf;
+
   /**
    * The device we're backing up to.
@@ -346 +352 @@
    * compression_level is 0.
    */
-    char zip_exe[MAX_STR_LEN / 4];
+    char *zip_exe;
 
   /**
@@ -352 +358 @@
    * bz2, gzip uses gz, etc. Do not include the dot.
    */
-    char zip_suffix[MAX_STR_LEN / 4];
+    char *zip_suffix;
 
   /**
@@ -383 +389 @@
 
   /**
-   * A filename containing a list of extensions, one per line, to not
-   * compress. If this is set to "", afio will still exclude a set of well-known
-   * compressed files from compression, but biggiefiles that are compressed
-   * will be recompressed again.
-   */
-    char do_not_compress_these[MAX_STR_LEN / 2];
-
-  /**
    * If TRUE, then we should verify a backup.
    */
@@ -465 +463 @@
 
   /**
+   * The string corresponding to the media type
+   */
+    char *backup_media_string;
+
+  /**
    * Whether we should use a premade filelist or generate our own.
    * If TRUE, then we generate our own filelist from the directories in @p include_paths.
@@ -476 +479 @@
    * If you do nothing, "/" will be used.
    */
-    char include_paths[MAX_STR_LEN*4];
+    char *include_paths;
 
   /**
@@ -483 +486 @@
    * the scratchdir, and the tempdir are automatically excluded.
    */
-    char exclude_paths[MAX_STR_LEN*4];
+    char *exclude_paths;
 
   /**
@@ -490 +493 @@
    * without overwriting the old ones. Ignored during a backup.
    */
-    char restore_path[MAX_STR_LEN];
+    char *restore_path;
 
   /**
@@ -500 +503 @@
    * A command to call to make an ISO image.
    */
-    char call_make_iso[MAX_STR_LEN];
+    char *call_make_iso;
 
   /**
    * A command to call to burn the ISO image.
-   */
-    char call_burn_iso[MAX_STR_LEN];
+   * BERLIOS: Useful ???
+   */
+    char *call_burn_iso;
 
   /**
@@ -614 +618 @@
     bool expanded;
 };
-
-
-
-/**
- * A structure to wrap a FIFO device for writing to a tape/CD stream.
- * @bug Is this structure used (w/the move to a standalone @c buffer and all)?
- */
-struct s_wrapfifo {
-        /**
-     * The device we write to or read from (a FIFO).
-     */
-    char public_device[MAX_STR_LEN / 4];
-
-        /**
-     * The actual device that data from the FIFO should be buffered and written to.
-     */
-    char private_device[MAX_STR_LEN / 4];
-
-        /**
-     * A buffer for holding data read from the FIFO.
-     */
-    char internal_buffer_IN_fifo[MAX_STR_LEN / 4];
-
-        /**
-     * A buffer for holding data to be written to the FIFO.
-     */
-    char internal_buffer_OUT_fifo[MAX_STR_LEN / 4];
-
-        /**
-     * If TRUE, then we're writing directly to the tape streamer; if FALSE, we're writing to the FIFO.
-     */
-    bool writing_to_private_device;
-};
-
-
 
 /**
@@ -801 +770 @@
 };
 
-struct s_mrconf {
-    int ia64_boot_size;
-    char *iso_creation_cmd;
-};
+struct s_mr_conf {
+    int mindi_ia64_boot_size;
+    char *mondo_iso_creation_cmd;
+};

trunk/mondo/mondo/common/newt-specific.c

@@ -14 +14 @@
 
 #include <unistd.h>
+#include <math.h>
 
 #include "my-stuff.h"
@@ -28 +29 @@
 //static char cvsid[] = "$Id$";
 
-    extern pid_t g_mastermind_pid;
-    extern char *g_tmpfs_mountpt;
-    extern char *g_mondo_home;
-
-    extern void set_signals(int);
+extern pid_t g_mastermind_pid;
+extern char *g_tmpfs_mountpt;
+extern char *g_mondo_home;
+
+extern void set_signals(int);
 
 /**
@@ -41 +42 @@
  * Whether we are currently in a nested call of fatal_error().
  */
-    bool g_exiting = FALSE;
-
-    newtComponent g_timeline = NULL,    ///< The line of the progress form that shows the time elapsed/remaining
-        g_percentline = NULL,   ///< The line of the progress form that shows the percent completed/remaining
-        g_scale = NULL,         ///< The progress bar component in the progress form
-        g_progressForm = NULL,  ///< The progress form component itself
-        g_blurb1 = NULL,        ///< The component for line 1 of the blurb in the progress form
-        g_blurb2 = NULL,        ///< The component for line 2 of the blurb in the progress form
-        g_blurb3 = NULL,        ///< The component for line 3 (updated continuously) of the blurb in the progress form
-        g_label = NULL;         ///< ????? @bug ?????
+bool g_exiting = FALSE;
+
+newtComponent g_timeline = NULL,    ///< The line of the progress form that shows the time elapsed/remaining
+    g_percentline = NULL,   ///< The line of the progress form that shows the percent completed/remaining
+    g_scale = NULL,         ///< The progress bar component in the progress form
+    g_progressForm = NULL,  ///< The progress form component itself
+    g_blurb1 = NULL,        ///< The component for line 1 of the blurb in the progress form
+    g_blurb2 = NULL,        ///< The component for line 2 of the blurb in the progress form
+    g_blurb3 = NULL,        ///< The component for line 3 (updated continuously) of the blurb in the progress form
+    g_label = NULL;         ///< ????? @bug ?????
 
 /**
  * Padding above the Newt components, to overcome bugs in Newt.
  */
-    char **err_log_lines = NULL,    ///< The list of log lines to show on the screen.
-        *g_blurb_str_1,         ///< The string for line 1 of the blurb in the progress form
-        *g_blurb_str_2,         ///< The string for line 2 of the blurb in the progress form
-        *g_blurb_str_3;         ///< The string for line 3 (updated continuously) of the blurb in the progress form
+char **err_log_lines = NULL,    ///< The list of log lines to show on the screen.
+    *g_blurb_str_1,         ///< The string for line 1 of the blurb in the progress form
+    *g_blurb_str_2,         ///< The string for line 2 of the blurb in the progress form
+    *g_blurb_str_3;         ///< The string for line 3 (updated continuously) of the blurb in the progress form
     newtComponent g_isoform_main = NULL,    ///< The evalcall form component itself
-        g_isoform_header = NULL,    ///< The component for the evalcall form title
-        g_isoform_scale = NULL, ///< The progress bar component in the evalcall form
-        g_isoform_timeline = NULL,  ///< The line of the evalcall form that shows the time elapsed/remaining
-        g_isoform_pcline = NULL;    ///< The line of the evalcall form that shows the percent completed/remaining
-    long g_isoform_starttime;   ///< The time (in seconds since the epoch) that the evalcall form was opened.
-    int g_isoform_old_progress = -1;    ///< The most recent progress update of the evalcall form (percent).
-    char *g_isoform_header_str; ///< The string for the evalcall form title.
-    int g_mysterious_dot_counter;   ///< The counter for the twirling baton (/ | \\ - ...) on percentage less than 3
-    int g_noof_log_lines = 6;   ///< The number of lines to show in the log at the bottom of the screen.
-    int g_noof_rows = 25;       ///< The number of rows on the screen.
-
-    int g_currentY = 3;         ///< The row to write background progress messages to. Incremented each time a message is written.
-    extern int g_current_media_number;
+    g_isoform_header = NULL,    ///< The component for the evalcall form title
+    g_isoform_scale = NULL, ///< The progress bar component in the evalcall form
+    g_isoform_timeline = NULL,  ///< The line of the evalcall form that shows the time elapsed/remaining
+    g_isoform_pcline = NULL;    ///< The line of the evalcall form that shows the percent completed/remaining
+long g_isoform_starttime;   ///< The time (in seconds since the epoch) that the evalcall form was opened.
+int g_isoform_old_progress = -1;    ///< The most recent progress update of the evalcall form (percent).
+char *g_isoform_header_str; ///< The string for the evalcall form title.
+int g_mysterious_dot_counter;   ///< The counter for the twirling baton (/ | \\ - ...) on percentage less than 3
+int g_noof_log_lines = 6;   ///< The number of lines to show in the log at the bottom of the screen.
+int g_noof_rows = 25;       ///< The number of rows on the screen.
+
+int g_currentY = 3;         ///< The row to write background progress messages to. Incremented each time a message is written.
+extern int g_current_media_number;
     pid_t g_main_pid = 0;       ///< The PID of the main Mondo process.
-    long g_maximum_progress = 999;  ///< The maximum amount of progress (100%) for the currently opened progress form.
-    long g_current_progress = -999; ///< The current amount of progress (filelist #, etc.) for the currently opened progress form.
-    long g_start_time = 0;      ///< The time (in seconds since the epoch) that the progress form was opened.
-    bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
-    bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
-    char *g_erase_tmpdir_and_scratchdir;    ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
-    char *g_selfmounted_isodir; ///< Holds the NFS mountpoint if mounted via mondoarchive.
+long g_maximum_progress = 999;  ///< The maximum amount of progress (100%) for the currently opened progress form.
+long g_current_progress = -999; ///< The current amount of progress (filelist #, etc.) for the currently opened progress form.
+long g_start_time = 0;      ///< The time (in seconds since the epoch) that the progress form was opened.
+bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
+bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
+char *g_erase_tmpdir_and_scratchdir;    ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
+char *g_selfmounted_isodir = NULL;  ///< Holds the NFS mountpoint if mounted via mondoarchive.
 
 /* @} - end of globalGroup */
@@ -86 +87 @@
 //int g_fd_in=-1, g_fd_out=-1;
 
-    void popup_and_OK(char *);
+void popup_and_OK(char *);
 
 
@@ -280 +281 @@
         kill_anything_like_this("ntfsclone");
         sync();
-        asprintf(&tmp, "umount %s", g_tmpfs_mountpt);
-        chdir("/");
-        for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
-            log_msg(2, "Waiting for child processes to terminate");
-            sleep(1);
-            run_program_and_log_output(tmp, 5);
-        }
-        paranoid_free(tmp);
+        if (g_tmpfs_mountpt != NULL) {
+            asprintf(&tmp, "umount %s", g_tmpfs_mountpt);
+            chdir("/");
+            for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
+                log_msg(2, "Waiting for child processes to terminate");
+                sleep(1);
+                run_program_and_log_output(tmp, 5);
+            }
+            paranoid_free(tmp);
+        }
 
         if (g_erase_tmpdir_and_scratchdir) {
@@ -298 +301 @@
             asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
+            paranoid_free(g_selfmounted_isodir);
         }
 
@@ -356 +360 @@
             asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
+            paranoid_free(g_selfmounted_isodir);
         }
 //  iamhere("foo");
@@ -469 +474 @@
 
         if (err_log_lines) {
-            paranoid_free(&err_log_lines[0]);
+            paranoid_free(err_log_lines[0]);
             for (i = 1; i < g_noof_log_lines; i++) {
                 err_log_lines[i - 1] = err_log_lines[i];
@@ -676 +681 @@
 
         /*@ pointers ********************************************************* */
-        char *entry_value = NULL;
+        char **entry_value = NULL;
 
         /*@ buffers ********************************************************** */
@@ -702 +707 @@
             newtEntry(2, newtTextboxGetNumLines(text) + 2,
                       output, 50,
-                      &entry_value, NEWT_FLAG_RETURNEXIT
+                      entry_value, NEWT_FLAG_RETURNEXIT
             );
         b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, _("  OK  "));
@@ -721 +726 @@
             // Copy entry_value before destroying the form
             // clearing potentially output before
-            paranoid_alloc(output,entry_value);
+            paranoid_alloc(output,*entry_value);
         }
         newtFormDestroy(myForm);

trunk/mondo/mondo/include/mr_conf.h

@@ -31 +31 @@
 
 /*initialization and closing*/
-int mr_conf_open(const char *filename);
-void mr_conf_close();
+extern int mr_conf_open(const char *filename);
+extern void mr_conf_close();
 
 /*read integer number after string str in the current file*/
-int mr_conf_iread(const char *field_name);
+extern int mr_conf_iread(const char *field_name);
 
 /*read double/float number after string str in the current file*/
-double mr_conf_fread(const char *field_name);
+extern double mr_conf_fread(const char *field_name);
 
 /*
@@ -44 +44 @@
  * This function allocates the string which has to be freed later on 
 */
-char *mr_conf_sread(const char *field_name);
+extern char *mr_conf_sread(const char *field_name);
 
 #endif                          /* MR_CONF_H */

trunk/mondo/mondo/include/mr_string.h

@@ -26 +26 @@
 /* functions (public methods) */
 
-char *mr_strtok(char *instr, const char *delims, int *lastpos);
+extern char *mr_strtok(char *instr, const char *delims, int *lastpos);
 
 #endif                          /* MR_STRING_H */

trunk/mondo/mondo/include/my-stuff.h

@@ -22 +22 @@
  * The main header file for Mondo.
  */
-
-/* Required for the use of getline, ... */
-#define _GNU_SOURCE
 
 #include <stdio.h>

trunk/mondo/mondo/lib/Makefile.am

@@ -2 +2 @@
 ## Process this file with Automake to generate `Makefile.in'
 ##
-AM_CPPFLAGS = -DMONDO_SHARE=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -DMONDO_SHARE=\"$(pkgdatadir)\" -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/mondo/include
 
 ## libmr
 noinst_LIBRARIES = libmr.a
 
-libmr_a_SOURCES  = mr_conf.c mr_conf.h \
-                   mr_string.c mr_string.h
+libmr_a_SOURCES  = mr_conf.c mr_string.c

trunk/mondo/mondo/mondoarchive/Makefile.am

@@ -2 +2 @@
 ## Process with Automake to generate Makefile.in
 ##
-AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\"
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/mondo/include
 
 ## Headers
@@ -10 +10 @@
 sbin_PROGRAMS        = mondoarchive
 mondoarchive_SOURCES = main.c mondo-cli.c
-mondoarchive_LDADD   = ${top_builddir}/mondo/common/libmondo.a
+mondoarchive_LDADD   = ${top_builddir}/mondo/common/libmondo.a ${top_builddir}/mondo/lib/libmr.a

trunk/mondo/mondo/mondoarchive/main.c

@@ -17 +17 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -33 +33 @@
 extern bool g_remount_cdrom_at_end, g_remount_floppy_at_end;
 extern char *g_mondo_home;
-extern char *g_tmpfs_mountpt;
 extern char *g_erase_tmpdir_and_scratchdir;
 extern double g_kernel_version;
@@ -41 +40 @@
 long diffs;
 
-extern t_bkptype g_backup_media_type;
 extern int g_loglevel;
 
 /****************** subroutines used only by main.c ******************/
 
+extern void mr_archive_init_conf(struct s_mr_conf *mr_conf);
 
 /**
@@ -131 +130 @@
 {
     struct s_bkpinfo *bkpinfo;
-    struct s_mrconf *mrconf;
     char *tmp;
     int res = 0;
@@ -147 +145 @@
     }
 
-/* If -V, -v or --version then echo version no. and quit */
+    /* If -V, -v or --version then echo version no. and quit */
     if (argc == 2
         && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V")
@@ -155 +153 @@
     }
 
-/* Initialize variables */
-
+    /* Initialize variables */
     malloc_libmondo_global_strings();
-
-    /* Initialize Configuration Structure */
-    mrarchive_init_conf(mrconf);
 
     res = 0;
@@ -170 +164 @@
     }
 
-
-/* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
+    /* Initialize Configuration Structure */
+    mr_archive_init_conf(bkpinfo->mr_conf);
+
+
+    /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
     asprintf(&tmp, "/sbin:/usr/sbin:%s:/usr/local/sbin", getenv("PATH"));
     setenv("PATH", tmp, 1);
     paranoid_free(tmp);
 
-/* Add the ARCH environment variable for ia64 purposes */
+    /* Add the ARCH environment variable for ia64 purposes */
     setenv("ARCH", get_architecture(), 1);
 
@@ -331 +328 @@
     /* If we're meant to backup then backup */
     if (bkpinfo->backup_data) {
-        res = backup_data(bkpinfo, mrconf);
+        res = backup_data(bkpinfo);
         retval += res;
         if (res) {

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -7 +7 @@
 /** @def BOOT_LOADER_CHARS The characters allowed for boot loader on this platform. */
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "mondo-cli-EXT.h"
@@ -18 +18 @@
 extern bool g_text_mode;
 extern bool g_skip_floppies;    ///< Whether to skip the creation of boot disks
-extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
-extern char g_tmpfs_mountpt[MAX_STR_LEN];
-extern bool g_sigpipe;
-
-/*@ file pointer **************************************************/
-extern FILE *g_tape_stream;
-
-/*@ long long *****************************************************/
-extern long long g_tape_posK;
-
-/*@ long **********************************************************/
-extern long g_noof_sets;
-
-/*@ bool******** **************************************************/
-bool g_debugging = FALSE;       ///< ????? @bug ????? @ingroup globalGroup
-bool g_running_live = FALSE;    ///< ????? @bug ????? @ingroup globalGroup
 extern bool g_cd_recovery;
+extern double g_kernel_version;
+extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
 
 /**
@@ -44 +30 @@
  */
 bool g_ISO_restore_mode = FALSE;
-
-
-extern double g_kernel_version;
-
-extern int g_current_media_number;
-
-
-
-extern pid_t g_main_pid;
-
-
-
-
-extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
-
 
 
@@ -140 +111 @@
     paranoid_free(tmp);
 
-    if (bkpinfo->nfs_mount[0] != '\0') {
+    if (bkpinfo->nfs_mount != NULL) {
         store_nfs_config(bkpinfo);
     }
@@ -303 +274 @@
         if (!strcmp(bkpinfo->include_paths, "/")) {
             log_msg(2, "'/' is pleonastic.");
-            bkpinfo->include_paths[0] = '\0';
-        }
-        if (bkpinfo->include_paths[0]) {
-            strcat(bkpinfo->include_paths, " ");
+            bkpinfo->include_paths = NULL;
         }
         asprintf(&tmp1, flag_val['I']);
@@ -332 +300 @@
         paranoid_free(tmp1);
 
-        strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
-                flag_val['I'],
-                4*MAX_STR_LEN - strlen(bkpinfo->include_paths));
+        if (bkpinfo->include_paths == NULL) {
+            asprintf(&tmp1, "%s", flag_val['I']);
+        } else {
+            asprintf(&tmp1, "%s %s", bkpinfo->include_paths, flag_val['I']);
+        }
+        paranoid_alloc(bkpinfo->include_paths,tmp1);
+        paranoid_free(tmp1);
+
         log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
         if (bkpinfo->include_paths[0] == '-') {
@@ -348 +321 @@
     }
 
-
     if (flag_set['J']) {
         if (flag_set['I']) {
@@ -356 +328 @@
         }
         bkpinfo->make_filelist = FALSE;
-        strcpy(bkpinfo->include_paths, flag_val['J']);
-    }
+        paranoid_alloc(bkpinfo->include_paths, flag_val['J']);
+    }
+
     if (flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) {
         if (!flag_set['r'] && g_kernel_version <= 2.5
@@ -374 +347 @@
         }
 
-        if (system("which cdrecord > /dev/null 2> /dev/null")
-            && system("which dvdrecord > /dev/null 2> /dev/null")) {
-            fatal_error
-                ("Please install dvdrecord/cdrecord and try again.");
-        }
         if (flag_set['C']) {
             bkpinfo->cdrw_speed = atoi(flag_val['C']);
@@ -408 +376 @@
         }
     }
+
     if (flag_set['t'] && !flag_set['d']) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
@@ -437 +406 @@
             }
         }
-        tmp = find_home_of_exe("growisofs");
-        if (!tmp) {
-            fatal_error
-                ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
-        }
-        paranoid_free(tmp);
-
-        tmp = find_home_of_exe("dvd+rw-format");
-        if (!tmp) {
-            fatal_error
-                ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
-        }
-        paranoid_free(tmp);
 
         if (strchr(flag_val['d'], ',')) {
@@ -498 +454 @@
     }
     if (flag_set['n']) {
-        asprintf(&tmp, flag_val['n']);
-        bkpinfo->nfs_mount = tmp;
+        paranoid_alloc(bkpinfo->nfs_mount,flag_val['n']);
         if (!flag_set['d']) {
-            asprintf(&tmp, "/");
-            bkpinfo->nfs_remote_dir = tmp;
+            paranoid_alloc(bkpinfo->nfs_remote_dir,"/");
         }
         asprintf(&tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
+        paranoid_free(bkpinfo->isodir);
         bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp);
         paranoid_free(tmp);
@@ -516 +471 @@
         log_msg(3, "isodir= %s", bkpinfo->isodir);
     }
+
     if (flag_set['c']) {
         bkpinfo->backup_media_type = cdr;
@@ -541 +497 @@
     }
 
-/* optional, popular */
+    /* optional, popular */
     if (flag_set['g']) {
         g_text_mode = FALSE;
     }
+
     if (flag_set['E']) {
-        if (bkpinfo->exclude_paths[0]) {
-            strcat(bkpinfo->exclude_paths, " ");
-        }
         asprintf(&tmp1, flag_val['E']);
         p = tmp1;
@@ -571 +525 @@
         paranoid_free(tmp1);
 
-        strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
-                flag_val['E'],
-                4*MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
-    }
+        if (bkpinfo->exclude_paths == NULL) {
+            asprintf(&tmp1, "%s", flag_val['E']);
+        } else {
+            asprintf(&tmp1, "%s %s", bkpinfo->exclude_paths, flag_val['E']);
+        }
+        paranoid_alloc(bkpinfo->exclude_paths,tmp1);
+        paranoid_free(tmp1);
+    }
+
     if (flag_set['e']) {
         bkpinfo->please_dont_eject = TRUE;
     }
+
     if (flag_set['N'])          // exclude NFS mounts & devices
     {
         psz = list_of_NFS_mounts_only();
-        if (bkpinfo->exclude_paths[0]) {
-            strncat(bkpinfo->exclude_paths, " ", MAX_STR_LEN);
-        }
-        strncat(bkpinfo->exclude_paths, psz, MAX_STR_LEN);
+        if (bkpinfo->exclude_paths != NULL) {
+            asprintf(&tmp1, "%s %s", bkpinfo->exclude_paths, psz);
+        } else {
+            asprintf(&tmp1, "%s", psz);
+        }
         paranoid_free(psz);
+        paranoid_alloc(bkpinfo->exclude_paths, tmp1);
+        paranoid_free(tmp1);
 
         log_msg(3, "-N means we're now excluding %s",
                 bkpinfo->exclude_paths);
     }
-    if (strlen(bkpinfo->exclude_paths) >= MAX_STR_LEN) {
-        fatal_error
-            ("Your '-E' parameter is too long. Please use '-J'. (See manual.)");
-    }
+
     if (flag_set['b']) {
         asprintf(&psz, flag_val['b']);
@@ -613 +573 @@
         bkpinfo->internal_tape_block_size = itbs;
     }
+
     if (flag_set['D']) {
         bkpinfo->differential = 1;
@@ -621 +582 @@
         }
     }
+
     if (flag_set['x']) {
-        asprintf(&tmp, flag_val['x']);
-        bkpinfo->image_devs = tmp;
+        paranoid_alloc(bkpinfo->image_devs,flag_val['x']);
         if (run_program_and_log_output("which ntfsclone", 2)) {
             fatal_error("Please install ntfsprogs package/tarball.");
         }
     }
+
     if (flag_set['m']) {
         bkpinfo->manual_cd_tray = TRUE;
     }
+
     if (flag_set['k']) {
         if (strcasecmp(flag_val['k'], "FAILSAFE")) {
-            asprintf(&tmp, "FAILSAFE");
-            bkpinfo->kernel_path = tmp;
+            paranoid_alloc(bkpinfo->kernel_path,"FAILSAFE");
 
             if (!does_file_exist(bkpinfo->kernel_path)) {
@@ -645 +607 @@
             }
         } else {
-            asprintf(&tmp, flag_val['k']);
-            bkpinfo->kernel_path = tmp;
-        }
-    }
+            paranoid_alloc(bkpinfo->kernel_path,flag_val['k']);
+        }
+    }
+
     if (flag_set['p']) {
-        asprintf(&tmp, bkpinfo->prefix);
-        bkpinfo->prefix = tmp;
-    }
-
+        paranoid_alloc(bkpinfo->prefix,flag_val['p']);
+    }
 
     if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
         if (flag_set['i']) {
-            asprintf(&tmp, flag_val['d']);
-            bkpinfo->isodir = tmp;
+            paranoid_alloc(bkpinfo->isodir,flag_val['d']);
             asprintf(&tmp, "ls -l %s", bkpinfo->isodir);
             if (run_program_and_log_output(tmp, FALSE)) {
@@ -666 +625 @@
             paranoid_free(tmp);
         } else if (flag_set['n']) {
-            asprintf(&tmp, flag_val['d']);
-            bkpinfo->nfs_remote_dir = tmp;
+            paranoid_alloc(bkpinfo->nfs_remote_dir,flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
 
@@ -698 +656 @@
             }
         } else if ((tmp = find_cdrw_device()) ==  NULL) {
-            paranoid_free(bkpinfo->media_device);
-            bkpinfo->media_device = tmp;
+            paranoid_alloc(bkpinfo->media_device, tmp);
+            paranoid_free(tmp);
             retval++;
             log_to_screen
@@ -723 +681 @@
     j = (int) random() % 32768;
     if (flag_set['S']) {
-        asprintf(&tmp, "%s/mondo.scratch.%ld", flag_val['S'], j);
+        asprintf(&tmp, "%s/mondo.scratch.%d", flag_val['S'], j);
         paranoid_free(bkpinfo->scratchdir);
         bkpinfo->scratchdir = tmp;
     }
     if (flag_set['T']) {
-        asprintf(&tmp, "%s/mondo.tmp.%ld", flag_val['T'], j);
+        asprintf(&tmp, "%s/mondo.tmp.%d", flag_val['T'], j);
         paranoid_free(bkpinfo->tmpdir);
         bkpinfo->tmpdir = tmp;
@@ -750 +708 @@
         paranoid_free(tmp);
     }
+
     if (flag_set['A']) {
-        asprintf(&tmp, flag_val['A']);
-        bkpinfo->call_after_iso = tmp;
+        paranoid_alloc(bkpinfo->call_after_iso,flag_val['A']);
     }
     if (flag_set['B']) {
-        asprintf(&tmp, flag_val['B']);
-        bkpinfo->call_before_iso = tmp;
+        paranoid_alloc(bkpinfo->call_before_iso,flag_val['B']);
     }
     if (flag_set['F']) {
@@ -784 +741 @@
 #undef BOOT_LOADER_CHARS
     }
+
+    tmp = NULL;
     if (flag_set['f']) {
         tmp = resolve_softlinks_to_get_to_actual_device_file(flag_val['f']);
-        bkpinfo->boot_device = tmp;
+        paranoid_alloc(bkpinfo->boot_device,tmp);
     }
     if (flag_set['Q']) {
@@ -796 +755 @@
         log_msg(3, "boot loader is %c, residing at %s", i, tmp);
         printf(_("boot loader is %c, residing at %s\n"), i, tmp);
+        paranoid_free(tmp);
         finish(0);
     }
@@ -801 +761 @@
 
     if (flag_set['P']) {
-        asprintf(&tmp, flag_val['P']);
-        bkpinfo->postnuke_tarball = tmp;
-    }
+        paranoid_alloc(bkpinfo->postnuke_tarball,flag_val['P']);
+    }
+
     if (flag_set['L']) {
         bkpinfo->use_lzo = TRUE;
@@ -821 +781 @@
             (_("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary."));
     }
+
     if (flag_set['o']) {
         bkpinfo->make_cd_use_lilo = TRUE;

trunk/mondo/mondo/mondorestore/Makefile.am

@@ -2 +2 @@
 ## Process with Automake to generate Makefile.in
 ##
+
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/mondo/include
 
 ## Headers
@@ -12 +14 @@
 mondorestore_SOURCES  = mondo-prep.c mondo-restore.c mondo-rstr-newt.c \
                         mondo-rstr-compare.c mondo-rstr-tools.c
-mondorestore_LDADD    = ${top_builddir}/mondo/common/libmondo.a @MONDORESTORE_STATIC@
+mondorestore_LDADD    = ${top_builddir}/mondo/common/libmondo.a ${top_builddir}/mondo/lib/libmr.a @MONDORESTORE_STATIC@
+
+

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -9 +9 @@
 
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "mondoprep.h"
@@ -53 +53 @@
     char *command;
     int lino;
-    int i;
     FILE *fout;
     char *buf;
-    const int blocksize = 512;
     struct list_of_disks *drivelist = NULL;
 // If LVMs are present and a zero-and-reboot wasn't recently undertaken
 // then zero & insist on reboot.
-    buf = malloc(blocksize);
     if (does_file_exist("/tmp/i-want-my-lvm"))  // FIXME - cheating :)
     {
@@ -89 +86 @@
             log_to_screen("Please hit 'Enter' to reboot.");
             for (lino = 0; lino < drivelist->entries; lino++) {
-                for (i = 0; i < blocksize; i++) {
-                    buf[i] = 0;
-                }
-                sprintf(buf, "%s\n", MONDO_WAS_HERE);
+                asprintf(&buf, "%s\n", MONDO_WAS_HERE);
                 fout = fopen(drivelist->el[lino].device, "w+");
                 if (!fout) {
@@ -98 +92 @@
                             drivelist->el[lino].device);
                 } else {
-                    if (1 != fwrite(buf, blocksize, 1, fout)) {
+                    if (1 != fwrite(buf, strlen(buf)+1, 1, fout)) {
                         log_msg(1, "Failed to wipe %s",
                                 drivelist->el[lino].device);
@@ -107 +101 @@
                     fclose(fout);
                 }
+                paranoid_free(buf);
             }
             sync();
@@ -257 +252 @@
     for (getline(&incoming, &n1, fin); !feof(fin); getline(&incoming, &n1, fin)) {
         fgetpos(fin, &orig_pos);
-        /* BERLIOS : Strange no ? */
+        /* we want to execute lines begining with a # */
         if (incoming[0] != '#') {
             continue;
@@ -268 +263 @@
         }
         if ((p = strstr(incoming, "vgcreate"))) {
-// include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
+            // include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
             for (getline(&tmp, &n, fin); !feof(fin); getline(&tmp, &n, fin)) {
                 if (tmp[0] == '#') {
@@ -287 +282 @@
                 }
             }
-            malloc_string(tmp1);
-            strcpy(tmp1, p + strlen("vgcreate") + 1);
+            asprintf(&tmp1, p + strlen("vgcreate") + 1);
             for (q = tmp1; *q > 32; q++);
             *q = '\0';
@@ -294 +288 @@
             asprintf(&tmp, "rm -Rf /dev/%s", tmp1);
             paranoid_free(tmp1);
+
             run_program_and_log_output(tmp, 1);
             paranoid_free(tmp);
@@ -304 +299 @@
         }
         for (p = incoming + 1; *p == ' '; p++);
-        paranoid_free(command);
-        asprintf(&command, p);
+        paranoid_alloc(command,p);
         for (p = command; *p != '\0'; p++);
         for (; *(p - 1) < 32; p--);
         *p = '\0';
+
+        /* BERLIOS: we should rather define LVMv1 or v2 and use it */
         res = run_program_and_log_output(command, 5);
         if (res > 0 && (p = strstr(command, "lvm "))) {
@@ -338 +334 @@
             log_msg(5, "p='%s' --> extents=%ld", p, extents);
             paranoid_free(tmp);
+
             p = strstr(command, "-L");
             if (!p) {
@@ -349 +346 @@
                         *q = ' ';
                     }
+                    /* BERLIOS: Dangerous: no size control !! */
                     sprintf(p, "%ld", extents);
                     i = strlen(p);
@@ -359 +357 @@
                         *(q - 1) = ' ';
                     }
+                    /* BERLIOS: Dangerous: no size control !! */
                     sprintf(p, "%ld%c", extents, 'm');
                     i = strlen(p);
@@ -673 +672 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+#ifdef __FreeBSD__
     char *line = NULL;
     char *status = NULL;
@@ -679 +679 @@
     size_t n = 0;
     size_t n1 = 0;
+#endif
 
     /** end ****************************************************************/
@@ -1525 +1526 @@
             // If so, then we just call label_drive_or_slice() and return.
             char c;
+            char *command;
+
             if (current_devno == 1) {
                 // try DangerouslyDedicated mode
@@ -1538 +1541 @@
                                                  drivename,
                                                  0);
-                    char command[MAX_STR_LEN];
-                    sprintf(command, "disklabel -B %s",
+                    asprintf(&command, "disklabel -B %s",
                             basename(drivename));
                     if (system(command)) {
@@ -1546 +1548 @@
                              ("Warning! Unable to make the drive bootable."));
                     }
+                    paranoid_free(command);
                     paranoid_free(device_str);
 
@@ -2077 +2080 @@
         asprintf(&partcode, "8e");
     } else if (format[0] == '\0') { /* LVM physical partition */
-        asprintf(&partcode, "");
+        asprintf(&partcode, "%s", "");
     } else if (strlen(format) >= 1 && strlen(format) <= 2) {
         asprintf(&partcode, format);
@@ -2375 +2378 @@
 
     assert_string_is_neither_NULL_nor_zerolength(format);
-    assert(program != NULL);
 
     if (strcmp(format, "swap") == 0) {
 #ifdef __FreeBSD__
-        strcpy(program, "true");
+        asprintf(&program, "true");
 #else
-        strcpy(program, "mkswap");
+        asprintf(&program, "mkswap");
 #endif
     } else if (strcmp(format, "vfat") == 0) {
-        strcpy(program, "format-and-kludge-vfat");
+        asprintf(&program, "format-and-kludge-vfat");
 #ifndef __FreeBSD__
     } else if (strcmp(format, "reiserfs") == 0) {
-        strcpy(program, "mkreiserfs -ff");
+        asprintf(&program, "mkreiserfs -ff");
     } else if (strcmp(format, "xfs") == 0) {
-        strcpy(program, "mkfs.xfs -f -q");
+        asprintf(&program, "mkfs.xfs -f -q");
     } else if (strcmp(format, "jfs") == 0) {
-        strcpy(program, "mkfs.jfs");
+        asprintf(&program, "mkfs.jfs");
     } else if (strcmp(format, "ext3") == 0) {
-        strcpy(program, "mkfs -t ext2 -F -j -q");
+        asprintf(&program, "mkfs -t ext2 -F -j -q");
     } else if (strcmp(format, "minix") == 0) {
-        strcpy(program, "mkfs.minix");
+        asprintf(&program, "mkfs.minix");
 #endif
     } else if (strcmp(format, "ext2") == 0) {
-        strcpy(program, "mke2fs -F -q");
+        asprintf(&program, "mke2fs -F -q");
     } else {
 #ifdef __FreeBSD__
-        sprintf(program, "newfs_%s", format);
+        asprintf(&program, "newfs_%s", format);
 #else
-        sprintf(program, "mkfs -t %s -c", format);  // -c checks for bad blocks
+        asprintf(&program, "mkfs -t %s -c", format);    // -c checks for bad blocks
 #endif
         asprintf(&tmp, "Unknown format (%s) - assuming '%s' will do", format,
@@ -2504 +2506 @@
     }
 
-    /*
-       sprintf (tmp, "cp -f %s %s.pre-resize", g_mountlist_fname, g_mountlist_fname);
-       run_program_and_log_output (tmp, FALSE);
-     */
-
     current_size_of_drive = get_phys_size_of_drive(drive_name);
 
@@ -2600 +2597 @@
     assert(mountlist != NULL);
 
-    if (g_mountlist_fname[0] == '\0') {
+    if (g_mountlist_fname == NULL) {
         log_it
             ("resize_mountlist_prop...() - warning - mountlist fname is blank");
@@ -2648 +2645 @@
     if (c && strncmp(c, "/disc", 5) == 0) {
         /* yup its devfs, change the "disc" to "part" so the existing code works */
-        strcpy(c + 1, "part");
+        strncpy(c + 1, "part", (size_t)5);
     }
     drivemntlist->entries = 0;

trunk/mondo/mondo/mondorestore/mondo-restore-EXT.h

@@ -10 +10 @@
 extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
 extern bool g_I_have_just_nuked;
-extern char *g_tmpfs_mountpt;
 extern char *g_isodir_device;
 extern char *g_isodir_format;
@@ -32 +31 @@
                          struct raidlist_itself *);
 extern void sort_mountlist_by_device(struct mountlist_itself *);
-extern void find_pathname_of_executable_preferably_in_RESTORING(char *,
-                                                                char *,
-                                                                char *);
 extern int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
                             struct raidlist_itself *);
@@ -53 +49 @@
 extern int restore_a_biggiefile_from_CD(struct s_bkpinfo *, long,
                                         struct s_node *);
-extern int restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *,
-                                            long, char *, long long,
-                                            struct s_node *);
+extern char *restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *,
+                                            long, struct s_node *, int);
 extern int restore_a_tarball_from_CD(char *, int, struct s_node *);
 extern int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, int,

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -13 +13 @@
 #include <unistd.h>
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -158 +158 @@
     assert(raidlist != NULL);
     if (!bkpinfo->disaster_recovery) {
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
         log_msg(2, "I guess you're testing edit_mountlist()");
     }
@@ -310 +310 @@
 /**************************************************************************
  *END_  EXTRACT_CONFIG_FILE_FROM_RAMDISK                                  *
- **************************************************************************/
-
-
-/**
- * Locate an executable in the directory structure rooted at @p restg.
- * @param out_path Where to put the executable.
- * @param fname The basename of the executable.
- * @param restg The directory structure to look in.
- * @note If it could not be found in @p restg then @p fname is put in @p out_path.
- * @ingroup restoreUtilityGroup
- */
-void
-find_pathname_of_executable_preferably_in_RESTORING(char *out_path,
-                                                    char *fname,
-                                                    char *restg)
-{
-    assert(out_path != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(fname);
-
-    sprintf(out_path, "%s/sbin/%s", restg, fname);
-    if (does_file_exist(out_path)) {
-        sprintf(out_path, "%s/usr/sbin/%s", restg, fname);
-        if (does_file_exist(out_path)) {
-            sprintf(out_path, "%s/bin/%s", restg, fname);
-            if (does_file_exist(out_path)) {
-                sprintf(out_path, "%s/usr/bin/%s", restg, fname);
-                if (does_file_exist(out_path)) {
-                    strcpy(out_path, fname);
-                }
-            }
-        }
-    }
-}
-
-/**************************************************************************
- *END_FIND_PATHNAME_OF_EXECUTABLE_PREFERABLY_IN_RESTORING                 *
  **************************************************************************/
 
@@ -534 +498 @@
              ask_me_yes_or_no
              (_("Do you want me to restore _some_ of your data?")))) {
-        old_restpath = bkpinfo->restore_path;
+        asprintf(&old_restpath,bkpinfo->restore_path);
         for (done = FALSE; !done;) {
             unlink("/tmp/filelist.full");
@@ -548 +512 @@
                     if (!strcmp(bkpinfo->restore_path, "/")) {
                         if (!ask_me_yes_or_no(_("Are you sure?"))) {
-                            paranoid_free(bkpinfo->restore_path);
-                            bkpinfo->restore_path = old_restpath;
+                            paranoid_alloc(bkpinfo->restore_path, old_restpath);
                             goto gotos_suck;
                         }
@@ -558 +521 @@
                     free_filelist(filelist);
                 } else {
-                    bkpinfo->restore_path = old_restpath;
+                    paranoid_alloc(bkpinfo->restore_path,old_restpath);
                     free_filelist(filelist);
                 }
@@ -569 +532 @@
             }
         }
+        paranoid_free(old_restpath);
     } else {
         mvaddstr_and_log_it(g_currentY++,
@@ -630 +594 @@
                             ("Warning - errors occurred during the restore phase."));
     }
+    return(retval);
 }
 
@@ -750 +715 @@
     bool boot_loader_installed = FALSE;
     char *tmp = NULL;
-    char tmpA[MAX_STR_LEN];
-    char tmpB[MAX_STR_LEN];
-    char tmpC[MAX_STR_LEN];
+    char *tmpA = NULL;
+    char *tmpB = NULL;
+    char *tmpC = NULL;
 
     assert(bkpinfo != NULL);
@@ -807 +772 @@
             tmp = call_program_and_get_last_line_of_output("cat /proc/cmdline");
 #endif
-            if (strstr(tmp,,"nopart")) {
+            if (strstr(tmp,"nopart")) {
                 log_msg(2,
                         "Not partitioning drives due to 'nopart' option.");
@@ -949 +914 @@
     if (filelist) {
         save_filelist(filelist, "/tmp/selected-files.txt");
-        old_restpath = bkpinfo->restore_path;
+        asprintf(&old_restpath,bkpinfo->restore_path);
         if (popup_and_get_string(_("Restore path"),
                                  _("Restore files to where? )"),
@@ -957 +922 @@
         }
         free_filelist(filelist);
-        bkpinfo->restore_path = old_restpath;
+        paranoid_alloc(bkpinfo->restore_path,old_restpath);
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1012 +977 @@
     char *bigblk = NULL;
     char *pathname_of_last_file_restored = NULL;
-    int retval = 0;
     int finished = FALSE;
     long sliceno;
@@ -1172 +1136 @@
             asprintf(&tmp3,
                     "Asking for %s #%d so that I may read slice #%ld\n",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number, sliceno);
             log_msg(2, tmp3);
@@ -1178 +1142 @@
 
             asprintf(&tmp3, _("Restoring from %s #%d"),
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(tmp3);
@@ -1198 +1162 @@
                         asprintf(&bzip2_command, "bzip2 -dc %s 2>> %s",tmp2, MONDO_LOGFILE);
                 } else if (does_file_exist(tmp)) {
-                        asprintf(&bzip2_command, "");
+                        asprintf(&bzip2_command, "%s", "");
                 } else {
                     log_to_screen(_("OK, that's pretty fsck0red..."));
@@ -1209 +1173 @@
             }
             asprintf(&tmp3, "Working on %s #%d, file #%ld, slice #%ld ",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number, bigfileno + 1, sliceno);
             log_msg(2, tmp3);
@@ -1300 +1264 @@
     char *command = NULL;
     char *outfile_fname = NULL;
-    char *ntfsprog_command = NULL;
     char *ntfsprog_fifo = NULL;
     char *file_to_openout = NULL;
@@ -1418 +1381 @@
     }
 
-    if (!bkpinfo->zip_exe[0]) {
+    if (bkpinfo->zip_exe == NULL) {
         asprintf(&command, "cat > \"%s\"", file_to_openout);
     } else {
@@ -1649 +1612 @@
                 asprintf(&tmp, " -bz");
             } else {
-                asprintf(&tmp, "");
+                asprintf(&tmp, "%s", "");
             }
             asprintf(&command,
@@ -1792 +1755 @@
             "Restoring from fileset #%ld (%ld KB) on %s #%d",
             current_tarball_number, (long) size >> 10,
-            media_descriptor_string(bkpinfo->backup_media_type),
+            bkpinfo->backup_media_string,
             g_current_media_number);
     log_msg(2, tmp);
@@ -1869 +1832 @@
         // star
         if (filelist) {
-            asprintf(&command, "star -x file=%s %s list=%s 2>> %s", afio_fname, executable
+            asprintf(&command, "star -x file=%s %s list=%s 2>> %s", afio_fname, executable,
                     filelist_subset_fname,MONDO_LOGFILE);
         } else {
@@ -1946 +1909 @@
     long noof_biggiefiles = 0L, bigfileno = 0L, total_slices = 0L;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     bool just_changed_cds = FALSE, finished = FALSE;
     char *xattr_fname = NULL;
@@ -1997 +1961 @@
             log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
                     bigfileno + 1,
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             tmp1 = slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, "");
@@ -2012 +1976 @@
                                          ++g_current_media_number);
                 asprintf(&tmp, _("Restoring from %s #%d"),
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type),
+                        bkpinfo->backup_media_string,
                         g_current_media_number);
                 log_to_screen(tmp);
@@ -2124 +2087 @@
 
     asprintf(&progress_str, _("Restoring from %s #%d"),
-            media_descriptor_string(bkpinfo->backup_media_type),
+            bkpinfo->backup_media_string,
             g_current_media_number);
     log_to_screen(progress_str);
@@ -2174 +2137 @@
             paranoid_free(progress_str);
             asprintf(&progress_str, _("Restoring from %s #%d"),
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(progress_str);
@@ -2182 +2145 @@
                     _("Restoring from fileset #%ld on %s #%d"),
                     current_tarball_number,
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
 //    log_msg(3, "progress_str = %s", progress_str);
@@ -2198 +2161 @@
             }
             asprintf(&tmp, _("%s #%d, fileset #%ld - restore %s"),
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number, current_tarball_number,tmp1);
             paranoid_free(tmp1);
@@ -2260 +2223 @@
     char *xattr_fname = NULL;
     char *acl_fname = NULL;
-    char *p = NULL;
     char *pathname_of_last_biggie_restored = NULL;
     char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
-    long long biggie_size = NULL;
-    FILE *fbw = NULL;
+    long long biggie_size = (long long)0;
+    FILE *fbw;
 
     assert(bkpinfo != NULL);
@@ -2506 +2468 @@
         asprintf(&progress_str, _("Restoring from fileset #%ld on %s #%d"),
                 current_afioball_number,
-                media_descriptor_string(bkpinfo->backup_media_type),
+                bkpinfo->backup_media_string,
                 g_current_media_number);
         res =
@@ -2735 +2697 @@
     malloc_libmondo_global_strings();
 
-    g_mondo_home = call_program_and_get_last_line_of_output("which mondorestore"));
-    sprintf(g_tmpfs_mountpt, "/tmp/tmpfs");
+    g_mondo_home = call_program_and_get_last_line_of_output("which mondorestore");
+    paranoid_alloc(g_tmpfs_mountpt, "/tmp/tmpfs");
     make_hole_for_dir(g_tmpfs_mountpt);
     g_current_media_number = 1; // precaution
@@ -2746 +2708 @@
     reset_bkpinfo(bkpinfo);
     bkpinfo->backup_media_type = none;  // in case boot disk was made for one backup type but user wants to restore from another backup type
+    bkpinfo->backup_media_string = NULL;
     bkpinfo->restore_data = TRUE;   // Well, yeah :-)
     if (am_I_in_disaster_recovery_mode()) {
@@ -2757 +2720 @@
 
     log_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
-    if (strlen(g_mountlist_fname) < 3) {
-        fatal_error
-            ("Serious error in malloc()'ing. Could be a bug in your glibc.");
-    }
     mkdir(MNT_CDROM, 0x770);
 
@@ -2812 +2771 @@
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
         if (!does_file_exist(g_mountlist_fname)) {
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
         }
         res = let_user_edit_the_mountlist(bkpinfo, mountlist, raidlist);
@@ -2839 +2798 @@
         bkpinfo->compression_level = 1;
         g_current_media_number = 2;
-        strcpy(bkpinfo->restore_path, "/tmp/TESTING");
+        paranoid_alloc(bkpinfo->restore_path, "/tmp/TESTING");
         bkpinfo->backup_media_type = dvd;
+        paranoid_free(bkpinfo->backup_media_string);
+        bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
         open_progress_form(_("Reassembling /dev/hda1"),
                            _("Shark is a bit of a silly person."),
@@ -2965 +2926 @@
 
         iamhere("About to call load_mountlist and load_raidtab");
-        strcpy(bkpinfo->restore_path, MNT_RESTORING);
+        paranoid_alloc(bkpinfo->restore_path, MNT_RESTORING);
         read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
         retval = load_mountlist(mountlist, g_mountlist_fname);
@@ -2978 +2939 @@
                 && !is_this_device_mounted(bkpinfo->nfs_mount)) {
                 log_msg(1, "Mounting nfs dir");
-                sprintf(bkpinfo->isodir, "/tmp/isodir");
+                paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
                 asprintf(&tmp, "mount %s -t nfs -o nolock /tmp/isodir",
@@ -3000 +2961 @@
             log_msg(0, "Partitioning only.");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
             res = partition_everything(mountlist);
@@ -3009 +2970 @@
             log_msg(0, "Formatting only.");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
             res = format_everything(mountlist, FALSE, raidlist);
@@ -3018 +2979 @@
             log_msg(0, "Stopping LVM and RAID");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
             res = do_my_funky_lvm_stuff(TRUE, FALSE);

trunk/mondo/mondo/mondorestore/mondo-restore.h

@@ -10 +10 @@
 int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *,
                   struct raidlist_itself *);
-void find_pathname_of_executable_preferably_in_RESTORING(char *, char *,
-                                                         char *);
 int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
                      struct raidlist_itself *);
@@ -22 +20 @@
 int restore_mode(struct s_bkpinfo *, struct mountlist_itself *,
                  struct raidlist_itself *);
-int restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *, long,
-                                     char *, long long, struct s_node *,
-                                     int, char *);
+char *restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *, long,
+                                     struct s_node *, int);
 int restore_a_tarball_from_CD(char *, long, struct s_node *);
 int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, long,

trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

@@ -4 +4 @@
 
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -44 +44 @@
     char *p = NULL;
     int i = 0;
-    int n = 0;
+    size_t n = 0;
     int retval = 0;
 
@@ -258 +258 @@
         }
         paranoid_free(tmp);
+
         if (use_star) {
             if (strcmp(compressor_exe, "bzip2")) {
@@ -264 +265 @@
             }
         } else {
-            asprintf(&tmp, compressor_exe);
-            sprintf(compressor_exe, "-P %s -Z", tmp);
+            tmp = compressor_exe;
+            asprintf(&compressor_exe, "-P %s -Z", tmp);
             paranoid_free(tmp);
         }
@@ -299 +300 @@
         log_OS_error(command);
     }
+    paranoid_free(command);
+
     if (length_of_file(logfile) > 5) {
-        sprintf(command,
+        asprintf(&command,
                 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vx \"dev/.*\" >> /tmp/changed.txt",
                 logfile);
         system(command);
+        paranoid_free(command);
         archiver_errors = count_lines_in_file(logfile);
     } else {
         archiver_errors = 0;
     }
-    paranoid_free(command);
 
     if (archiver_errors) {
@@ -353 +356 @@
 
     asprintf(&progress_str, _("Comparing with %s #%d "),
-            media_descriptor_string(bkpinfo->backup_media_type),
+            bkpinfo->backup_media_string,
             g_current_media_number);
 
@@ -402 +405 @@
             paranoid_free(progress_str);
             asprintf(&progress_str, _("Comparing with %s #%d "),
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(progress_str);

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -537 +537 @@
     char *personalities = NULL;
     char *prompt = NULL;
-    char *sz = NULL;
     int out = 0, res = 0;
 
@@ -544 +543 @@
     system
         ("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    personalities = last_line_of_file("/tmp/raid-personalities.txt"));
+    personalities = last_line_of_file("/tmp/raid-personalities.txt");
     asprintf(&prompt, _("Please enter the RAID level you want. %s"),
              personalities);
@@ -616 +615 @@
     int i = 0;
     int pos = 0;
-
-    /** buffers ***********************************************************/
-    char *tmp = NULL;
 
     assert(mountlist != NULL);
@@ -858 +854 @@
             popup_and_OK(tmp);
         } else {
+            paranoid_free(av->el[lino].label);
+            paranoid_free(av->el[lino].value);
             memcpy((void *) &av->el[lino], (void *) &av->el[av->entries--],
                    sizeof(struct raid_var_line));
+            /* BERLIOS: New way of doing should be replaced by line below. Hope it's ok.
+             * Will be when memory for struct is also dynamically allocated
+            av->el[lino] = av->el[av->entries--];
+                   */
         }
     }
@@ -1323 +1325 @@
                                                  device);
                 if (j < 0) {
-                    sprintf(tmp,
+                    asprintf(&tmp,
                             _
                             ("/etc/raidtab does not have an entry for %s; please delete it and add it again"),
                             mountlist->el[currline].device);
                     popup_and_OK(tmp);
+                    paranoid_free(tmp);
                 } else {
                     log_it(_("edit_raidlist_entry - calling"));
@@ -1499 +1502 @@
 
     void *keylist[10];
-    void *curr_choice;
+    void *curr_choice = NULL;
 
     int currline2 = 0;
@@ -1971 +1974 @@
             raidrec->additional_vars.el[lino].label, sz_out);
     if (popup_and_get_string(header, comment, sz_out)) {
-        strcpy(raidrec->additional_vars.el[lino].value, sz_out);
+        paranoid_free(raidrec->additional_vars.el[lino].value);
+        raidrec->additional_vars.el[lino].value = sz_out;
     }
     paranoid_free(header);
     paranoid_free(comment);
-    paranoid_free(sz_out);
 }
 #endif
@@ -2015 +2018 @@
     int currline = 0;
     int finished = FALSE;
+    int res = 0;
 
     /** buffers **********************************************************/
@@ -2025 +2029 @@
     assert(raidlist != NULL);
 
-    asprintf(&flaws_str_A, "xxxxxxxxx");
-    asprintf(&flaws_str_B, "xxxxxxxxx");
-    asprintf(&flaws_str_C, "xxxxxxxxx");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
         log_to_screen(_("Arbitrary limits suck, man!"));
@@ -2045 +2046 @@
             _("Format"), _("Size (MB)"));
     headerMsg = newtLabel(2, 1, tmp);
-    flawsLabelA = newtLabel(2, 13, flaws_str_A);
-    flawsLabelB = newtLabel(2, 14, flaws_str_B);
-    flawsLabelC = newtLabel(2, 15, flaws_str_C);
+    flawsLabelA = newtLabel(2, 13, "x");
+    flawsLabelB = newtLabel(2, 14, "x");
+    flawsLabelC = newtLabel(2, 15, "x");
     partitionsListbox =
         newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -2057 +2058 @@
                           bEdit, bDelete, bReload, bCancel, bOK, NULL);
     while (!finished) {
-        evaluate_mountlist(mountlist, flaws_str_A, flaws_str_B,
+        res = evaluate_mountlist(mountlist, flaws_str_A, flaws_str_B,
                            flaws_str_C);
         newtLabelSetText(flawsLabelA, flaws_str_A);
         newtLabelSetText(flawsLabelB, flaws_str_B);
         newtLabelSetText(flawsLabelC, flaws_str_C);
+
+        paranoid_free(flaws_str_A);
+        paranoid_free(flaws_str_B);
+        paranoid_free(flaws_str_C);
+
         b_res = newtRunForm(myForm);
         /* BERLIOS: This needs to be re-written */
         if (b_res == bOK) {
-            if (!evaluate_mountlist
-                (mountlist, flaws_str_A, flaws_str_B, flaws_str_C)) {
+            if (!res) {
                 finished =
                     ask_me_yes_or_no
@@ -2113 +2118 @@
             }
         }
-        paranoid_free(flaws_str_A);
-        paranoid_free(flaws_str_B);
-        paranoid_free(flaws_str_C);
     }
     newtFormDestroy(myForm);
@@ -2413 +2415 @@
     raidrec = &raidlist->el[pos_in_raidlist];
     initialize_raidrec(raidrec);
-    strcpy(raidrec->OSSWAP(raid_device, volname),
+    asprintf(&raidrec->OSSWAP(raid_device, volname),
            OSSWAP(device, basename(device)));
 #ifndef __FreeBSD__
@@ -2647 +2649 @@
                    (void *) &raidrec->additional_vars.el[i],
                    sizeof(struct raid_var_line));
+            /* BERLIOS : To be changed */
         }
         raidrec->additional_vars.entries--;

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.h

@@ -3 +3 @@
 **/
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -5 +5 @@
 #include <unistd.h>
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -39 +39 @@
 
 extern t_bkptype g_backup_media_type;
+extern char *g_backup_media_string;
 
 extern int g_partition_table_locked_up;
@@ -290 +291 @@
     assert(bkpinfo != NULL);
     g_ISO_restore_mode = TRUE;
+
+    paranoid_free(g_isodir_device);
     read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
     if (bkpinfo->disaster_recovery) {
 /* Patch Conor Daly 26-june-2004 
  * Don't let this clobber an existing bkpinfo->isodir */
-        if (!bkpinfo->isodir[0]) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
+        if (!bkpinfo->isodir) {
+            paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
         }
 /* End patch */
@@ -344 +347 @@
     i = what_number_cd_is_this(bkpinfo);    /* has the side-effect of calling mount_cdrom() */
     asprintf(&tmp, "%s #%d has been mounted via loopback mount",
-            media_descriptor_string(bkpinfo->backup_media_type), i);
+            bkpinfo->backup_media_string, i);
     log_msg(1, tmp);
     paranoid_free(tmp);
@@ -497 +500 @@
 {
     char *mount_cmd = NULL;
-    char *tmp = NULL;
     int i, res;
 #ifdef __FreeBSD__
@@ -519 +521 @@
         log_msg(2, "Mounting for NFS thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
+        if ((!bkpinfo->isodir || !strcmp(bkpinfo->isodir, "/"))
             && am_I_in_disaster_recovery_mode()) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
+            paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
@@ -663 +665 @@
         asprintf(&p2, ",user_xattr");
     } else {
-        asprintf(&p2, "");
+        asprintf(&p2, "%s", "");
     }
     paranoid_free(tmp);
@@ -671 +673 @@
         asprintf(&p3, ",acl");
     } else {
-        asprintf(&p3, "");
+        asprintf(&p3, "%s", "");
     }
     paranoid_free(tmp);
@@ -789 +791 @@
     char *value = NULL;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *command = NULL;
     char *iso_mnt = NULL;
@@ -836 +839 @@
 
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                paranoid_free(bkpinfo->prefix);
-                bkpinfo->prefix = value;
+                paranoid_alloc(bkpinfo->prefix,value);
             } else {
                 paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
@@ -845 +847 @@
             paranoid_free(value);
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                paranoid_free(bkpinfo->prefix);
-                bkpinfo->prefix = value;
+                paranoid_alloc(bkpinfo->prefix,value);
             } else {
                 paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
@@ -869 +870 @@
         } else if (bkpinfo->backup_media_type == tape
                    || bkpinfo->backup_media_type == udev) {
+            paranoid_free(bkpinfo->media_device);
             if (read_cfg_var(cfg_file, "media-dev", bkpinfo->media_device)) {
                 fatal_error("Cannot get tape device name from cfg file");
@@ -964 +966 @@
                     "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
         } else {
+            paranoid_free(bkpinfo->nfs_mount);
+            paranoid_free(bkpinfo->nfs_remote_dir);
             read_cfg_var(g_mondo_cfg_file, "nfs-server-mount",
                          bkpinfo->nfs_mount);
@@ -976 +980 @@
          * isodir in disaster recovery mode
          */
-        old_isodir = bkpinfo->isodir;
+        paranoid_alloc(old_isodir,bkpinfo->isodir);
         read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
         read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
         if (iso_mnt && iso_path) {
+            paranoid_free(bkpinfo->isodir);
             asprintf(&bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
-        } else {
-            bkpinfo->isodir = old_isodir;
         }
         paranoid_free(iso_mnt);
@@ -992 +995 @@
                     ("user nominated isodir differs from archive, keeping user's choice: %s %s\n",
                      old_isodir, bkpinfo->isodir);
-                if (bkpinfo->isodir != old_isodir) {
-                    paranoid_free(old_isodir);
-                }
-            } else {
-                paranoid_free(old_isodir);
-            }
-        }
-
+            }
+        }
+        paranoid_free(old_isodir);
+
+        paranoid_free(g_isodir_device);
         read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
         log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
@@ -1029 +1029 @@
                     paranoid_free(iso_mnt);
                     paranoid_free(iso_path);
-                    asprintf(&iso_mnt, "");
-                    asprintf(&iso_path, "");
+                    asprintf(&iso_mnt, "%s", "");
+                    asprintf(&iso_path, "%s", "");
 
                     if (mount_cdrom(bkpinfo)) {
@@ -1069 +1069 @@
     }
     g_backup_media_type = bkpinfo->backup_media_type;
+    bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
+    g_backup_media_string = bkpinfo->backup_media_string;
     return (0);
 }
@@ -1823 +1825 @@
     assert(bkpinfo != NULL);
 
-    malloc_string(g_tmpfs_mountpt);
-
     asprintf(&g_biggielist_txt, "%s/%s",bkpinfo->tmpdir , BIGGIELIST_TXT_STUB);
     asprintf(&g_filelist_full, "%s/%s", bkpinfo->tmpdir, FILELIST_FULL_STUB);
@@ -1830 +1830 @@
     asprintf(&g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these",
             bkpinfo->tmpdir);
+    paranoid_free(g_mondo_cfg_file);
+    paranoid_free(g_mountlist_fname);
     if (bkpinfo->disaster_recovery) {
         asprintf(&g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
@@ -2110 +2112 @@
 {
     int retval = 0;
-    char *device = NULL;
     char *command = NULL;
     char *cfg_file = NULL;
@@ -2364 +2365 @@
 
     g_backup_media_type = bkpinfo->backup_media_type;
+    bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
+    g_backup_media_string = bkpinfo->backup_media_string;
     return (retval);
 }