Changeset 2053 in MondoRescue for branches/2.2.8/mondo/src

Timestamp:

Oct 23, 2008, 3:16:34 PM (15 years ago)

Author:

Bruno Cornec

Message:

register-pid is gone

Location:

branches/2.2.8/mondo/src

Files:

• common/libmondo-cli.c (modified) (7 diffs)
• common/libmondo-files-EXT.h (modified) (1 diff)
• common/libmondo-files.c (modified) (1 diff)
• common/libmondo-files.h (modified) (1 diff)
• common/newt-specific.c (modified) (2 diffs)
• mondoarchive/mondoarchive.c (modified) (3 diffs)
• mondorestore/mondorestore.c (modified) (1 diff)

branches/2.2.8/mondo/src/common/libmondo-cli.c

@@ -414 +414 @@
 {
     int i = 0;
-    int lastpos = 0;
     int mount_cnt = 0;
     char *mounted_file_system = NULL;
@@ -559 +558 @@
     i = 0;
     lastpos = 0;
-    while (token = mr_strtok(partition_list, token_chars, &lastpos)) {
+    while ((token = mr_strtok(partition_list, token_chars, &lastpos)) != NULL) {
         log_msg (5, "Found partition: %s", token);
         strcpy(partitions[i++], token);
@@ -654 +653 @@
                     log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
                     lastpos = 0;
-                    while (token = mr_strtok(mount_list, token_chars, &lastpos)) {
+                    while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
                         log_msg (5, "mount point token: %s", token);
                         if ((DSFptr = find_mount_point_in_list(token)) == NULL) {
@@ -675 +674 @@
                     log_msg(4, "  Software raid device list: %s", mount_list);   
                     lastpos = 0;
-                    while (token = mr_strtok(mount_list, token_chars, &lastpos)) {
+                    while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
                         asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG); 
                         log_msg (5, "Running: %s", command);
@@ -728 +727 @@
         /* Loop through the software raid device list to see if we can find the partition */
         lastpos = 0;
-        while (token = mr_strtok(mount_list, token_chars, &lastpos)) {
+        while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
             asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, tmp);
             log_msg(4, "  Running: %s", command);
@@ -931 +930 @@
         }
         paranoid_free(tmp1);
-        while (token = mr_strtok(flag_val['I'], token_chars, &lastpos)) {
+        while ((token = mr_strtok(flag_val['I'], token_chars, &lastpos)) != NULL) {
             switch (get_dsf_mount_list(token, &mounted_on_dsf, &not_mounted_on_dsf)) {
             /* It's a dsf but not a whole disk dsf */
@@ -1238 +1237 @@
         paranoid_free(tmp1);
         lastpos = 0;
-        while (token = mr_strtok(flag_val['E'], token_chars, &lastpos)) {
+        while ((token = mr_strtok(flag_val['E'], token_chars, &lastpos)) != NULL) {
             switch (get_dsf_mount_list(token, &mounted_on_dsf, &not_mounted_on_dsf)) {
             case 1: 

branches/2.2.8/mondo/src/common/libmondo-files-EXT.h

@@ -25 +25 @@
 extern long noof_lines_that_match_wildcard(char *filelist_fname,
                                            char *wildcard);
-extern void register_pid(pid_t pid, char *name_str);
 extern long long space_occupied_by_cd(char *mountpt);
 extern int whine_if_not_found(char *fname);

branches/2.2.8/mondo/src/common/libmondo-files.c

@@ -1 @@
-/* libmondo-files.c                                  file manipulation
+/* file manipulation
    $Id$
-.
-
-
-04/16/04
-- find_home_of_exe() really does return NULL now if file not found
-
-03/22/04
-- added mode_of_file()
-
-10/02/03
-- cleaned up grab_percentage_from_last_line_of_file()
-
-09/18
-- added int make_grub_install_scriptlet()
-
-09/16
-- cleaned up mkisofs feedback window
-
-09/12
-- fixed Teuton-hostile bug in size_of_all_biggiefiles_K()
-
-09/05
-- added size_of_partition_in_mountlist_K()
-- size_of_all_biggiefiles_K() now calls get_phys_size_of_drive(fname)
-
-07/02
-- fixed calls to popup_and_get_string()
-
-05/19
-- added CP_BIN
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-05/04
-- find_home_of_exe() now returns NULL if file not found
-
-04/26
-- if >4 media est'd, say one meeeellion
-
-04/25
-- fixed minor bug in find_home_of_exe()
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-
-04/07
-- fix find_home_of_exe()
-- cleaned up code a bit
-
-03/27
-- copy_mondo_and_mindi_stuff --- if _homedir_/payload.tgz exists then untar it to CD
-
-01/14/2003
-- if backup media type == nfs then don't estimate no. of media reqd
-
-11/25/2002
-- don't log/echo estimated # of media required if >=50
-
-10/01 - 11/09
-- chmod uses 0x, not decimal :)
-- added is_this_file_compressed()
-- replace convoluted grep with wc (KP)
-
-09/01 - 09/30
-- only show "number of media" estimate if no -x
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-
-08/01 - 08/31
-- handle unknown media sizes
-- cleaned up some log_it() calls
-
-07/24
-- created
 */
 

branches/2.2.8/mondo/src/common/libmondo-files.h

@@ -27 +27 @@
                                   char *cklist_fname);
 long noof_lines_that_match_wildcard(char *filelist_fname, char *wildcard);
-void register_pid(pid_t pid, char *name_str);
 long size_of_all_biggiefiles_K();
 long long space_occupied_by_cd(char *mountpt);

branches/2.2.8/mondo/src/common/newt-specific.c

@@ -363 +363 @@
         }
         printf("Mondo has aborted.\n");
-        register_pid(0, "mondo");   // finish() does this too, FYI
         if (!g_main_pid) {
             log_msg(3, "FYI - g_main_pid is blank");
@@ -388 +387 @@
         /* newtPopHelpLine(); */
 
-        register_pid(0, "mondo");
         chdir("/");
         run_program_and_log_output("umount " MNT_CDROM, FALSE);

branches/2.2.8/mondo/src/mondoarchive/mondoarchive.c

@@ -39 +39 @@
 extern void set_signals(int);
 extern int g_current_media_number;
-extern void register_pid(pid_t, char *);
 extern int g_currentY;
 extern bool g_text_mode;
@@ -241 +240 @@
     log_msg(9, "This");
 
-    register_pid(g_main_pid, "mondo");
     set_signals(TRUE);          // catch SIGTERM, etc.
     run_program_and_log_output("dmesg -n1", TRUE);
@@ -448 +446 @@
     }
     distro_specific_kludges_at_end_of_mondoarchive();
-    register_pid(0, "mondo");
     set_signals(FALSE);
 

branches/2.2.8/mondo/src/mondorestore/mondorestore.c

@@ -2853 +2853 @@
     g_main_pid = getpid();
     srandom((int) (time(NULL)));
-    register_pid(getpid(), "mondo");
     set_signals(TRUE);
     g_kernel_version = get_kernel_version();