Changeset 2187 in MondoRescue

Timestamp:

Apr 30, 2009, 6:00:14 PM (16 years ago)

Author:

Bruno Cornec

Message:

Cleanup of code to remove duplication

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

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

@@ -2103 +2103 @@
     char *exclude_these_devices;
     char *exclude_these_directories;
-    static char result_sz[512];
+    static char result_sz[1024];
 
     malloc_string(exclude_these_devices);
     malloc_string(exclude_these_directories);
-    strcpy(exclude_these_directories,
-           call_program_and_get_last_line_of_output
-           ("mount -t coda,ncpfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
+    strcpy(exclude_these_directories,list_of_NFS_mounts_only());
     strcpy(exclude_these_devices,
            call_program_and_get_last_line_of_output
@@ -2131 +2129 @@
 char *list_of_NFS_mounts_only(void)
 {
-    char *exclude_these_devices;
     char *exclude_these_directories;
     static char result_sz[512];
 
-    malloc_string(exclude_these_devices);
     malloc_string(exclude_these_directories);
     strcpy(exclude_these_directories,
            call_program_and_get_last_line_of_output
            ("mount -t coda,ncpfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    strcpy(exclude_these_devices,
-           call_program_and_get_last_line_of_output
-           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nssvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     sprintf(result_sz, "%s", exclude_these_directories);
-    paranoid_free(exclude_these_devices);
     paranoid_free(exclude_these_directories);
     return (result_sz);