Changeset 1106 in MondoRescue for trunk/mondo/src/common/libmondo-filelist.c

Timestamp:

Feb 7, 2007, 11:55:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1082:1105 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-filelist.c (modified) (4 diffs)

trunk/mondo/src/common/libmondo-filelist.c

@@ -395 +395 @@
 
 
-int call_exe_and_pipe_output_to_fd(char *syscall, FILE * pout)
+int call_exe_and_pipe_output_to_fd(char *sys_call, FILE * pout)
 {
     FILE *pattr;
@@ -401 +401 @@
     size_t n = 0;
 
-    pattr = popen(syscall, "r");
+    pattr = popen(sys_call, "r");
     if (!pattr) {
-        mr_msg(1, "Failed to open fattr() %s", syscall);
+        mr_msg(1, "Failed to open fattr() %s", sys_call);
         return (1);
     }
     if (feof(pattr)) {
-        mr_msg(1, "Failed to call fattr() %s", syscall);
+        mr_msg(1, "Failed to call fattr() %s", sys_call);
         paranoid_pclose(pattr);
         return (2);
@@ -426 +426 @@
     FILE *pout;
     char *pout_command;
-    char *syscall;
+    char *sys_call;
     char *file_to_analyze = NULL;
     char *strtmp = NULL;
@@ -454 +454 @@
         /* BERLIOS : to be checked */
         mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
-        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);
+        mr_asprintf(&sys_call, "%s 2>> /dev/null", strtmp);
         mr_free(strtmp);
-        call_exe_and_pipe_output_to_fd(syscall, pout);
-        mr_free(syscall);
+        call_exe_and_pipe_output_to_fd(sys_call, pout);
+        mr_free(sys_call);
     }
     paranoid_fclose(fin);