Changeset 3148 in MondoRescue for branches/3.1/mondo/src/common


Ignore:
Timestamp:
Jun 19, 2013, 8:50:28 AM (11 years ago)
Author:
Bruno Cornec
Message:

2nd phase for svn merge -r 2935:3146 ../3.0

Location:
branches/3.1/mondo/src/common
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/3.1/mondo/src/common/libmondo-archive.c

    r3147 r3148  
    721721    }
    722722    log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
     723    if (bootldr_ver != NULL) {
     724        mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver);
     725        log_to_screen(tmp);
     726        mr_free(tmp);
     727    }
    723728    if (bootldr_ver != NULL) {
    724729        mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver);
    … …  
    18801885    FILE *fin = NULL;
    18811886    char *q;
     1887    char *q;
    18821888
    18831889    /*@ buffers ******************************************** */

  • branches/3.1/mondo/src/common/libmondo-cli.c

    r3147 r3148  
    508508                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
    509509                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
     510                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
     511                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
    510512                } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
    511513                    mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
    … …  
    517519                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
    518520                    mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
     521                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
     522                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
    519523                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
    520524                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);

  • branches/3.1/mondo/src/common/libmondo-devices.c

    r3147 r3148  
    332332    char *tmp = NULL;
    333333    char *p;
     334    char *p;
    334335
    335336    /*@ ints ******************************************************* */
    … …  
    983984    char *command = NULL;
    984985    char *format_sz = NULL;
     986    char *p;
    985987    char *p;
    986988

  • branches/3.1/mondo/src/common/libmondo-filelist.c

    r3147 r3148  
    398398    FILE *pattr = NULL;
    399399    char *tmp = NULL;
     400
     401    char *p;
    400402
    401403    char *p;

  • branches/3.1/mondo/src/common/libmondo-files.c

    r3147 r3148  
    5151    /*@ pointers **************************************************** */
    5252    char *p = NULL;
     53    char *q;
    5354    char *q;
    5455    FILE *fin;
    … …  
    128129    char *incoming = NULL;
    129130    char *q;
     131    char *q;
    130132
    131133    /*@ long ******************************************************** */
    … …  
    206208    char *tmp = NULL;
    207209    char *incoming = NULL;
     210    char *q;
    208211    char *q;
    209212
    … …  
    475478    char *command = NULL;
    476479    char *p = NULL;
     480    char *p = NULL;
    477481
    478482    /*@ pointers **************************************************** */
    … …  
    544548    char *curr_cksum = NULL;
    545549    char *tmp = NULL;
     550    char *q;
    546551    char *q;
    547552
    … …  
    684689    /*@ buffers **************************************************** */
    685690    char *incoming = NULL;
     691    char *p = NULL;
    686692    char *p = NULL;
    687693

  • branches/3.1/mondo/src/common/libmondo-fork.c

    r3147 r3148  
    4242    char *newcall = NULL;
    4343    char *tmp = NULL;
     44    char *p;
    4445    char *p;
    4546

  • branches/3.1/mondo/src/common/newt-specific.c

    r3147 r3148  
    171171        /*@ buffer *********************************************************** */
    172172        char *tmp = NULL;
     173        char *p;
    173174        char *p;
    174175        int i;
    … …  
    781782        /*@ buffers *********************************************************** */
    782783        char *prompt = NULL;
     784        char *q;
    783785        char *q;
    784786
    … …  
    11491151        static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
    11501152        char *outstr = NULL;
     1153        char *p;
    11511154        char *p;
    11521155        t_bkptype backup_type;
    … …  
    13481351        char *tmp = NULL;
    13491352        char *p;
     1353        char *p;
    13501354        char *tmp1 = NULL;
    13511355        FILE *fin, *fout;
Note: See TracChangeset for help on using the changeset viewer.