Changeset 3273 for branches/3.2


Ignore:
Timestamp:
Apr 29, 2014, 9:27:05 PM (5 years ago)
Author:
bruno
Message:
  • rename mondo-restore-EXT.h into mondorestore-EXT.h and removes the now useless mondo-restore.h (continue homogeneization)
Location:
branches/3.2/mondo/src
Files:
1 deleted
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/3.2/mondo/src/common/mondostructures.h

    r3225 r3273  
    365365  /**
    366366   * The compression program to use. Currently supported
    367    * choices are lzop and bzip2; gzip may also work. This is ignored if
     367   * choices are lzop, bzip2, gzip or lzma. This is ignored if
    368368   * compression_level is 0.
    369369   */
  • branches/3.2/mondo/src/mondorestore/Makefile.am

    r2770 r3273  
    66
    77## Headers
    8 noinst_HEADERS        = mondo-restore.h mondo-rstr-compare.h mondo-rstr-newt.h mondo-rstr-tools.h \
    9                         mondo-restore-EXT.h mr-externs.h \
     8noinst_HEADERS        = mondorestore.h mondo-rstr-compare.h mondo-rstr-newt.h mondo-rstr-tools.h \
     9                        mondorestore-EXT.h mr-externs.h \
    1010                        mondo-rstr-compare-EXT.h mondo-rstr-tools-EXT.h mondoprep.h
    1111                        mondorestore.h
  • branches/3.2/mondo/src/mondorestore/mondo-rstr-compare.c

    r3194 r3273  
    1111#include "mr-externs.h"
    1212#include "mondo-rstr-compare.h"
    13 #include "mondo-restore-EXT.h"
     13#include "mondorestore-EXT.h"
    1414#include "mondo-rstr-tools-EXT.h"
    1515
  • branches/3.2/mondo/src/mondorestore/mondorestore-EXT.h

    r3271 r3273  
    1 /* mondo-restore-EXT.h */
     1/* mondorestore-EXT.h */
    22
    33#ifdef __FreeBSD__
  • branches/3.2/mondo/src/mondorestore/mondorestore.c

    r3263 r3273  
    1414#include "../common/libmondo.h"
    1515#include "mr-externs.h"
    16 #include "mondo-restore.h"
    1716#include "mondorestore.h"
    1817#include "mondo-rstr-compare-EXT.h"
     
    9695
    9796/**
    98  * The location of 'mondo-restore.cfg', containing the metadata
     97 * The location of 'mondorestore.cfg', containing the metadata
    9998 * information for this backup.
    10099 */
     
    122121extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived,
    123122                                 char direction);
    124 
    125123
    126124
     
    15331531
    15341532    assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
     1533    assert(bkpinfo != NULL);
    15351534
    15361535    log_msg(5, "Entering");
     
    15891588            mr_asprintf(executable, "lzop");
    15901589        }
    1591         if (executable) {
    1592             mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
    1593             res = run_program_and_log_output(tmp, FALSE);
    1594             mr_free(tmp);
    1595 
    1596             if (res) {
    1597                 log_to_screen("(compare_a_tarball) Compression program %s not found - oh no!", executable);
    1598                 paranoid_MR_finish(1);
    1599             }
    1600             tmp = executable;
    1601             mr_asprintf(executable, "-P %s -Z", tmp);
    1602             mr_free(tmp);
     1590        if (bkpinfo->compression_level == 0) {
     1591            mr_asprintf(executable, "%s", "");
     1592        } else {
     1593            if (executable) {
     1594                mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
     1595                res = run_program_and_log_output(tmp, FALSE);
     1596                mr_free(tmp);
     1597   
     1598                if (res) {
     1599                    log_to_screen("(compare_a_tarball) Compression program %s not found - oh no!", executable);
     1600                    paranoid_MR_finish(1);
     1601                }
     1602                tmp = executable;
     1603                mr_asprintf(executable, "-P %s -Z", tmp);
     1604                mr_free(tmp);
     1605            }
    16031606        }
    16041607#ifdef __FreeBSD__
     
    16151618        } else {
    16161619            if (! executable) {
    1617                 log_msg(2, "Mo executable, this shouldn't happen !");
     1620                log_msg(2, "No executable, this shouldn't happen !");
    16181621            } else {
    16191622                if (filelist_subset_fname != NULL) {
  • branches/3.2/mondo/src/mondorestore/mr-externs.h

    r3194 r3273  
    22 * $Id$
    33 *
    4  * mondo-restore.c's externs
     4 * mondorestore.c's externs
    55 *
    66 */
Note: See TracChangeset for help on using the changeset viewer.