Changeset 3604 in MondoRescue for branches

Timestamp:

Sep 6, 2016, 5:38:38 PM (9 years ago)

Author:

Bruno Cornec

Message:

Fix #806 by setuping env var for english before callingcommands and avoid local msgs badly interpreted later on (F. Sommer)

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-devices.c (modified) (1 diff)
• libmondo-fork.c (modified) (3 diffs)

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -2196 +2196 @@
          */
 #ifdef __FreeBSD__
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,vmhgfs,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,vmhgfs,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
 #else
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x fuse.sshfs -x fuse -x vfat -x ntfs -x ntfs-3g -x vmhgfs -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("df -m -P -x nfs -x nfs4 -x fuse.sshfs -x fuse -x vfat -x ntfs -x ntfs-3g -x vmhgfs -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
 #endif
 

branches/3.2/mondo/src/common/libmondo-fork.c

@@ -45 +45 @@
     /*@ pointers **************************************************** */
     FILE *fin = NULL;
+    char *eng_call = NULL;
 
     /*@ initialize data ********************************************* */
@@ -52 +53 @@
 
     assert_string_is_neither_NULL_nor_zerolength(call);
-    log_msg(5, "cpaglloo called with '%s'", call);
-    if ((fin = popen(call, "r"))) {
+    mr_asprintf(eng_call,"LANG=C LANGUAGE=C %s",call);
+    log_msg(5, "cpaglloo called with '%s'", eng_call);
+    if ((fin = popen(eng_call, "r"))) {
         while (!feof(fin)) {
             mr_getline(tmp, fin);
@@ -66 +68 @@
         log_OS_error("Unable to open resulting file");
     }
+    mr_free(eng_call);
     strip_spaces(result);
     log_msg(5, "cpaglloo returns '%s'", result);