Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/devname.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/devname.c (modified) (6 diffs)

branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/devname.c

@@ -153 +153 @@
 
     DBG(DEBUG_DEVNAME, printf("opening %s\n", lvm_device));
-    if ((lvf = fopen(lvm_device, "r")) == NULL) {
+    if ((lvf = fopen_for_read(lvm_device)) == NULL) {
         DBG(DEBUG_DEVNAME, printf("%s: (%d) %s\n", lvm_device, errno,
                       strerror(errno)));
@@ -234 +234 @@
     char device[110];
 
-    procpt = fopen(PROC_EVMS_VOLUMES, "r");
+    procpt = fopen_for_read(PROC_EVMS_VOLUMES);
     if (!procpt)
         return 0;
     while (fgets(line, sizeof(line), procpt)) {
-        if (sscanf (line, " %d %d %d %*s %*s %[^\n ]",
+        if (sscanf(line, " %d %d %d %*s %*s %[^\n ]",
                 &ma, &mi, &sz, device) != 4)
             continue;
@@ -259 +259 @@
     FILE *proc;
     char line[1024];
-    char ptname0[128], ptname1[128], *ptname = 0;
+    char ptname0[128], ptname1[128], *ptname = NULL;
     char *ptnames[2];
     dev_t devs[2];
@@ -274 +274 @@
 
     if (cache->bic_flags & BLKID_BIC_FL_PROBED &&
-        time(0) - cache->bic_time < BLKID_PROBE_INTERVAL)
+        time(NULL) - cache->bic_time < BLKID_PROBE_INTERVAL)
         return 0;
 
@@ -283 +283 @@
 #endif
 
-    proc = fopen(PROC_PARTITIONS, "r");
+    proc = fopen_for_read(PROC_PARTITIONS);
     if (!proc)
         return -BLKID_ERR_PROC;
@@ -336 +336 @@
     fclose(proc);
 
-    cache->bic_time = time(0);
+    cache->bic_time = time(NULL);
     cache->bic_flags |= BLKID_BIC_FL_PROBED;
     blkid_flush_cache(cache);