Changeset 1191 in MondoRescue

Timestamp:

Feb 20, 2007, 11:20:31 AM (17 years ago)

Author:

Bruno Cornec

Message:

Finish the merge of trunk for mondoarchive branch with mondo-cli.c

File:

• branches/stable/mondo/src/mondoarchive/mondo-cli.c (modified) (45 diffs)

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -148 +148 @@
 {
     int j;
-    char tmp[MAX_STR_LEN], *p, comment[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *p = NULL;
+    char *q = NULL;
 
     assert(bkpinfo != NULL);
@@ -156 +158 @@
     for (j = 1, p = value; j < MAX_NOOF_MEDIA && strchr(p, ',');
          j++, p = strchr(p, ',') + 1) {
-        strncpy(tmp, p, MAX_STR_LEN);
-        *(strchr(tmp, ',')) = '\0';
+        mr_asprintf(&tmp, p);
+        q = strchr(tmp, ',');
+        if (q != NULL) {
+            *q = '\0';
+        }
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        sprintf(comment, "media_size[%d] = %ld", j,
+        mr_free(tmp);
+
+        mr_msg(3, "media_size[%d] = %ld", j,
                 bkpinfo->media_size[j]);
-        mr_msg(3, comment);
     }
     for (; j <= MAX_NOOF_MEDIA; j++) {
@@ -197 +203 @@
 
     /*@ buffers ** */
-    char *tmp;
-    char *tmp1;
-    char *psz;
-    char *p;
-    char *q;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
+    char *psz = NULL;
+    char *p = NULL;
+    char *q = NULL;
 
     long itbs = 0L;
@@ -208 +215 @@
 
     malloc_string(tmp);
-    malloc_string(psz);
 
     assert(bkpinfo != NULL);
@@ -216 +222 @@
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
 
-/* compulsory */
+    /* compulsory */
     i = flag_set['c'] + flag_set['i'] + flag_set['n'] +
         flag_set['t'] + flag_set['u'] + flag_set['r'] +
@@ -222 +228 @@
     if (i == 0) {
         retval++;
-        log_to_screen("You must specify the media type\n");
+        log_to_screen(_("You must specify the media type\n"));
     }
     if (i > 1) {
         retval++;
-        log_to_screen("Please specify only one media type\n");
+        log_to_screen(_("Please specify only one media type\n"));
     }
     if (flag_set['K']) {
@@ -236 +242 @@
     if (flag_set['L'] && flag_set['0']) {
         retval++;
-        log_to_screen("You cannot have 'no compression' _and_ LZOP.\n");
+        log_to_screen(_("You cannot have 'no compression' _and_ LZOP.\n"));
     }
     bkpinfo->backup_data = flag_set['O'];
     bkpinfo->verify_data = flag_set['V'];
     if (flag_set['I'] && !bkpinfo->backup_data) {
-        log_to_screen("-I switch is ignored if just verifying");
+        log_to_screen(_("-I switch is ignored if just verifying"));
     }
     if (flag_set['E'] && !bkpinfo->backup_data) {
-        log_to_screen("-E switch is ignored if just verifying");
+        log_to_screen(_("-E switch is ignored if just verifying"));
     }
 
@@ -272 +278 @@
         if (flag_set['f'] || flag_set['l']) {
             log_to_screen
-                ("You don't need to specify bootloader or bootdevice");
+                (_("You don't need to specify bootloader or bootdevice"));
         }
     }
@@ -317 +323 @@
         if (bkpinfo->include_paths[0] == '-') {
             retval++;
-            log_to_screen("Please supply a sensible value with '-I'\n");
+            log_to_screen(_("Please supply a sensible value with '-I'\n"));
         }
     }
@@ -327 +333 @@
     }
 
-
     if (flag_set['J']) {
         if (flag_set['I']) {
             retval++;
             log_to_screen
-                ("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
+                (_("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't combine -J with -I. Thanks. :-)"));
         }
         bkpinfo->make_filelist = FALSE;
         strcpy(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
@@ -350 +356 @@
         if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/")) {
             log_to_screen
-                ("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
+                (_("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk..."));
         }
 
@@ -366 +372 @@
             if (!flag_set['L']) {
                 log_to_screen
-                    ("You must use -L with -C. Therefore I am setting it for you.");
+                    (_("You must use -L with -C. Therefore I am setting it for you."));
                 flag_set['L'] = 1;
                 flag_val['L'][0] = '\0';
@@ -373 +379 @@
             mr_msg(3, "flag_val['c'] = %s", flag_val['c']);
             mr_msg(3, "flag_val['w'] = %s", flag_val['w']);
-//    mr_msg(3, "flag_set['r'] = %i", flag_set['r'] );
             if (flag_set['c']) {
                 bkpinfo->cdrw_speed = atoi(flag_val['c']);
@@ -388 +393 @@
         }
     }
+
     if (flag_set['t'] && !flag_set['d']) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
@@ -395 +401 @@
         }
         flag_set['d'] = TRUE;
-        sprintf(tmp,
-                "You didn't specify a tape streamer device. I'm assuming %s",
+        mr_asprintf(&tmp2,
+                _("You didn't specify a tape streamer device. I'm assuming %s"),
                 flag_val['d']);
-        log_to_screen(tmp);
+        log_to_screen(tmp2);
+        mr_free(tmp2);
         percent = 0;
     }
@@ -422 +429 @@
             if (!find_dvd_device(flag_val['d'], FALSE)) {
                 flag_set['d'] = TRUE;
-                log_to_screen("I guess DVD drive is at %s", flag_val['d']);
+                log_to_screen(_("I guess DVD drive is at %s"), flag_val['d']);
             }
         }
@@ -441 +448 @@
             strcat(flag_val['s'], "m");
             log_to_screen
-                ("You did not specify a size (-s) for DVD. I'm guessing %s.",
+                (_("You did not specify a size (-s) for DVD. I'm guessing %s."),
                  flag_val['s']);
             flag_set['s'] = 1;
         }
-/*
-      if (flag_set['Z']) {
-      bkpinfo->blank_dvd_first = TRUE;
-      }
-*/
     }
 
@@ -490 +492 @@
             strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
         }
-        sprintf(tmp, "mount | grep -E \"^%s .*\" | cut -d' ' -f3",
+        mr_asprintf(&tmp2, "mount | grep -E '^%s .*$' | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
         strncpy(bkpinfo->isodir,
-                call_program_and_get_last_line_of_output(tmp),
+                call_program_and_get_last_line_of_output(tmp2),
                 MAX_STR_LEN / 4);
+        mr_free(tmp2);
         if (strlen(bkpinfo->isodir) < 3) {
             retval++;
-            log_to_screen("NFS share is not mounted. Please mount it.\n");
+            log_to_screen(_("NFS share is not mounted. Please mount it.\n"));
         }
         mr_msg(3, "mount = %s", bkpinfo->nfs_mount);
         mr_msg(3, "isodir= %s", bkpinfo->isodir);
     }
+
     if (flag_set['c']) {
         bkpinfo->backup_media_type = cdr;
@@ -586 +590 @@
     if (flag_set['N'])          // exclude NFS mounts & devices
     {
-        strncpy(psz, list_of_NFS_mounts_only(), MAX_STR_LEN);
+        mr_asprintf(&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);
+        mr_free(psz);
         mr_msg(3, "-N means we're now excluding %s",
                 bkpinfo->exclude_paths);
@@ -599 +604 @@
     }
     if (flag_set['b']) {
-        strcpy(psz, flag_val['b']);
+        mr_asprintf(&psz, flag_val['b']);
         mr_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -607 +612 @@
             itbs = atol(psz);
         }
+        mr_free(psz);
+
         mr_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
         mr_msg(1, "Internal tape block size is now %ld bytes", itbs);
@@ -615 +622 @@
         bkpinfo->internal_tape_block_size = itbs;
     }
+
     if (flag_set['D']) {
         bkpinfo->differential = 1;
@@ -623 +631 @@
         }
     }
+
     if (flag_set['x']) {
         strncpy(bkpinfo->image_devs, flag_val['x'], MAX_STR_LEN / 4);
@@ -640 +649 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            sprintf(tmp,
-                    "You specified kernel '%s', which does not exist\n",
+            mr_asprintf(&tmp2,
+                    _("You specified kernel '%s', which does not exist\n"),
                     bkpinfo->kernel_path);
-            log_to_screen(tmp);
-        }
-    }
+            log_to_screen(tmp2);
+            mr_free(tmp2);
+        }
+    }
+
     if (flag_set['p']) {
         strncpy(bkpinfo->prefix, flag_val['p'], MAX_STR_LEN / 4);
     }
-
 
     if (flag_set['d']) {        /* backup directory (if ISO/NFS/USB) */
         if (flag_set['i']) {
             strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
-            sprintf(tmp, "ls -l %s", bkpinfo->isodir);
-            if (run_program_and_log_output(tmp, FALSE)) {
+            mr_asprintf(&tmp2, "ls -l %s", bkpinfo->isodir);
+            if (run_program_and_log_output(tmp2, FALSE)) {
                 fatal_error
                     ("output folder does not exist - please create it");
             }
+            mr_free(tmp2);
         } else if (flag_set['n']) {
             strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
@@ -667 +678 @@
 
     if (flag_set['n']) {
-        sprintf(tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
+        mr_asprintf(&tmp2, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir);
-        if (run_program_and_log_output(tmp, FALSE)) {
+        if (run_program_and_log_output(tmp2, FALSE)) {
             retval++;
-            sprintf(tmp,
-                    "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
+            mr_free(tmp2);
+            mr_asprintf(&tmp2,
+                    _("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n"),
                     bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
-            log_to_screen(tmp);
-        }
+            log_to_screen(tmp2);
+        }
+        mr_free(tmp2);
     }
 
@@ -682 +695 @@
         if (g_kernel_version >= 2.6) {
             if (popup_and_get_string
-                ("Device", "Please specify the device",
+                (_("Device"), _("Please specify the device"),
                  bkpinfo->media_device, MAX_STR_LEN / 4)) {
                 retval++;
-                log_to_screen("User opted to cancel.");
+                log_to_screen(_("User opted to cancel."));
             }
         } else if (find_cdrw_device(bkpinfo->media_device)) {
             retval++;
             log_to_screen
-                ("Tried and failed to find CD-R[W] drive automatically.\n");
+                (_("Tried and failed to find CD-R[W] drive automatically.\n"));
         } else {
             flag_set['d'] = TRUE;
@@ -699 +712 @@
     if (!flag_set['d'] && !flag_set['n'] && !flag_set['C']) {
         retval++;
-        log_to_screen("Please specify the backup device/directory.\n");
+        log_to_screen(_("Please specify the backup device/directory.\n"));
         fatal_error
             ("You didn't use -d to specify the backup device/directory.");
@@ -716 +729 @@
         sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%ld", flag_val['T'],
                 random() % 32768);
-        sprintf(tmp, "touch %s/.foo.dat", flag_val['T']);
-        if (run_program_and_log_output(tmp, 1)) {
+        mr_asprintf(&tmp2, "touch %s/.foo.dat", flag_val['T']);
+        if (run_program_and_log_output(tmp2, 1)) {
             retval++;
             log_to_screen
-                ("Please specify a tempdir which I can write to. :)");
+                (_("Please specify a tempdir which I can write to. :)"));
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
+        mr_free(tmp2);
+
+        mr_asprintf(&tmp2, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
                 flag_val['T']);
-        if (run_program_and_log_output(tmp, 1)) {
+        if (run_program_and_log_output(tmp2, 1)) {
             retval++;
             log_to_screen
-                ("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
+                (_("Please don't specify a SAMBA or VFAT or NFS tmpdir."));
             fatal_error("I cannot write to the tempdir you specified.");
         }
-    }
+        mr_free(tmp2);
+    }
+
     if (flag_set['A']) {
         strncpy(bkpinfo->call_after_iso, flag_val['A'], MAX_STR_LEN);
@@ -757 +774 @@
             (BOOT_LOADER_CHARS,
              (bkpinfo->boot_loader = flag_val['l'][0]))) {
-            mr_msg(1, "%c? WTF is %c? I need G, L, E or R.",
+            mr_msg(1, "%c? What is %c? I need G, L, E or R.",
                     bkpinfo->boot_loader, bkpinfo->boot_loader);
             fatal_error
@@ -764 +781 @@
 #undef BOOT_LOADER_CHARS
     }
+
     if (flag_set['f']) {
         strncpy(bkpinfo->boot_device,
@@ -770 +788 @@
                 MAX_STR_LEN / 4);
     }
+
+    if (flag_set['Q']) {
+        if (bkpinfo->boot_device == NULL) {
+            fatal_error("-f option required when using -Q\n");
+        }
+        i = which_boot_loader(bkpinfo->boot_device);
+        mr_msg(3, "boot loader is %c, residing at %s", i, bkpinfo->boot_device);
+        log_to_screen(_("boot loader is %c, residing at %s\n"), i, tmp);
+        finish(0);
+    }
+
     if (flag_set['P']) {
         strncpy(bkpinfo->postnuke_tarball, flag_val['P'], MAX_STR_LEN);
     }
-    if (flag_set['Q']) {
-        i = which_boot_loader(tmp);
-        mr_msg(3, "boot loader is %c, residing at %s", i, tmp);
-        printf("boot loader is %c, residing at %s\n", i, tmp);
-        finish(0);
-    }
+
     if (flag_set['L']) {
         bkpinfo->use_lzo = TRUE;
@@ -784 +808 @@
             retval++;
             log_to_screen
-                ("Please install LZOP. You can't use '-L' until you do.\n");
+                (_("Please install LZOP. You can't use '-L' until you do.\n"));
         }
     }
@@ -803 +827 @@
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen
-            ("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary.");
-    }
+            (_("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;
@@ -813 +838 @@
             bkpinfo->make_cd_use_lilo = TRUE;
             log_to_screen
-                ("Your kernel appears not to support vfat filesystems. I am therefore");
-            log_to_screen
-                ("using LILO instead of SYSLINUX as the CD/floppy's boot loader.");
+                (_("Your kernel appears not to support vfat filesystems. I am therefore"));
+            log_to_screen
+                (_("using LILO instead of SYSLINUX as the CD/floppy's boot loader."));
         }
         if (run_program_and_log_output("which mkfs.vfat", FALSE)) {
@@ -821 +846 @@
 #ifdef __IA32__
             log_to_screen
-                ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-            log_to_screen
-                ("your boot loader. I shall therefore use LILO instead.");
+                (_("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as"));
+            log_to_screen
+                (_("your boot loader. I shall therefore use LILO instead."));
 #endif
 #ifdef __IA64__
             log_to_screen
-                ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
-            log_to_screen("environment correctly. Please install it.");
+                (_("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI"));
+            log_to_screen(_("environment correctly. Please install it."));
             fatal_error("Aborting");
 #endif
@@ -846 +871 @@
     if (i == 0) {
         retval++;
-        log_to_screen("Specify backup (-O), verify (-V) or both (-OV).\n");
+        log_to_screen(_("Specify backup (-O), verify (-V) or both (-OV).\n"));
     }
 
@@ -852 +877 @@
 
     mr_free(tmp);
-    mr_free(psz);
     return (retval);
 }
-
 
 
@@ -876 +899 @@
     /*@ ints ** */
     int opt = 0;
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     int i = 0;
-    int len;
+    int len = 0;
 
     /*@ bools *** */
@@ -900 +923 @@
             if (flag_set[optopt]) {
                 bad_switches = TRUE;
-                sprintf(tmp, "Switch -%c previously defined as %s\n", opt,
+                mr_asprintf(&tmp, _("Switch -%c previously defined as %s\n"), opt,
                         flag_val[i]);
                 log_to_screen(tmp);
+                mr_free(tmp);
             } else {
                 flag_set[opt] = TRUE;
@@ -910 +934 @@
                         optarg[--len] = '\0';
                         log_to_screen
-                            ("Warning - param '%s' should not have trailing slash!",
+                            (_("Warning - param '%s' should not have trailing slash!"),
                              optarg);
                     }
@@ -916 +940 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            sprintf(tmp,
-                                    "-%c flag --- must be absolute path --- '%s' isn't absolute",
+                            mr_asprintf(&tmp,
+                                    _("-%c flag --- must be absolute path --- '%s' isn't absolute"),
                                     opt, flag_val[opt]);
                             log_to_screen(tmp);
+                            mr_free(tmp);
                             bad_switches = TRUE;
                         }
@@ -930 +955 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        sprintf(tmp, "Invalid arg -- %s\n", argv[i]);
+        mr_asprintf(&tmp, _("Invalid arg -- %s\n"), argv[i]);
         log_to_screen(tmp);
+        mr_free(tmp);
     }
     return (bad_switches);
 }
-
-
 
 
@@ -955 +979 @@
 void terminate_daemon(int sig)
 {
-    char tmp[64];
-    char tmp2[MAX_STR_LEN];
-    //  char command[512];
-    //  pid_t pid;
+    char *tmp = NULL;
+    char *tmp2 = NULL;
 
     switch (sig) {
     case SIGINT:
-        sprintf(tmp, "SIGINT");
-        strcpy(tmp2, "You interrupted me :-)");
+        mr_asprintf(&tmp, _("SIGINT signal received from OS"));
+        mr_asprintf(&tmp2, _("You interrupted me :-)"));
         break;
     case SIGKILL:
-        sprintf(tmp, "SIGKILL");
-        strcpy(tmp2,
-               "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
+        mr_asprintf(&tmp, _("SIGKILL signal received from OS"));
+        mr_asprintf(&tmp2,
+               _("I seriously have no clue how this signal even got to me. Something's wrong with your system."));
         break;
     case SIGTERM:
-        sprintf(tmp, "SIGTERM");
-        strcpy(tmp2, "Got terminate signal");
+        mr_asprintf(&tmp, _("SIGTERM signal received from OS"));
+        mr_asprintf(&tmp2, _("Got terminate signal"));
         break;
     case SIGHUP:
-        sprintf(tmp, "SIGHUP");
-        strcpy(tmp2, "Hangup on line");
+        mr_asprintf(&tmp, _("SIGHUP signal received from OS"));
+        mr_asprintf(&tmp2, _("Hangup on line"));
         break;
     case SIGSEGV:
-        sprintf(tmp, "SIGSEGV");
-        strcpy(tmp2,
-               "Internal programming error. Please send a backtrace as well as your log.");
+        mr_asprintf(&tmp, _("SIGSEGV signal received from OS"));
+        mr_asprintf(&tmp2,
+               _("Internal programming error. Please send a backtrace as well as your log."));
         break;
     case SIGPIPE:
-        sprintf(tmp, "SIGPIPE");
-        strcpy(tmp2, "Pipe was broken");
+        mr_asprintf(&tmp, _("SIGPIPE signal received from OS"));
+        mr_asprintf(&tmp2, _("Pipe was broken"));
         break;
     case SIGABRT:
-        sprintf(tmp, "SIGABRT");
-        sprintf(tmp2,
-                "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
+        mr_asprintf(&tmp, _("SIGABRT signal received from OS"));
+        mr_asprintf(&tmp2,
+                _("Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message."));
         break;
     default:
-        sprintf(tmp, "(Unknown)");
-    }
-
-    strcat(tmp, " signal received from OS");
+        mr_asprintf(&tmp, _("(Unknown)"));
+        mr_asprintf(&tmp2, _("(Unknown)"));
+    }
+
     log_to_screen(tmp);
     log_to_screen(tmp2);
+    mr_free(tmp);
+    mr_free(tmp2);
     if (sig == SIGABRT) {
         sleep(10);
@@ -1007 +1031 @@
     finish(254);                // just in case
 }
-
-
 
 
@@ -1030 +1052 @@
     }
 }
-
-