Changeset 305 in MondoRescue for branches/2.06/mondo/mondo/common

Timestamp:

Jan 12, 2006, 5:37:42 PM (18 years ago)

Author:

bcornec

Message:

use df -P everywhere to avoid split lines on df output and some bugs

Location:

branches/2.06/mondo/mondo/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-devices.c (modified) (1 diff)
• libmondo-tools.c (modified) (1 diff)

branches/2.06/mondo/mondo/common/libmondo-archive.c

@@ -545 +545 @@
     if (g_tmpfs_mountpt[0] != '\0') {
         i = atoi(call_program_and_get_last_line_of_output
-                 ("df -m | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4"));
+                 ("df -m -P | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4"));
         if (i > 0) {
             if (free_ramdisk_space > i) {

branches/2.06/mondo/mondo/common/libmondo-devices.c

@@ -2523 +2523 @@
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | grep -v /dev/shm | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | grep -v /dev/shm | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif
 

branches/2.06/mondo/mondo/common/libmondo-tools.c

@@ -1014 +1014 @@
     assert_string_is_neither_NULL_nor_zerolength(partition);
 
-    sprintf(command, "df -m %s &> /dev/null", partition);
+    sprintf(command, "df -m -P %s &> /dev/null", partition);
     if (system(command)) {
         return (-1);
     }                           // partition does not exist
-    sprintf(command, "df -m %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
+    sprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
             partition);
     strcpy(out_sz, call_program_and_get_last_line_of_output(command));