Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/inode_hash.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/inode_hash.c (modified) (6 diffs)

branches/3.3/mindi-busybox/libbb/inode_hash.c

@@ -12 +12 @@
 
 typedef struct ino_dev_hash_bucket_struct {
-    struct ino_dev_hash_bucket_struct *next;
     ino_t ino;
     dev_t dev;
+    /*
+     * Above fields can be 64-bit, while pointer may be 32-bit.
+     * Putting "next" field here may reduce size of this struct:
+     */
+    struct ino_dev_hash_bucket_struct *next;
+    /*
+     * Reportedly, on cramfs a file and a dir can have same ino.
+     * Need to also remember "file/dir" bit:
+     */
+    char isdir; /* bool */
     char name[1];
 } ino_dev_hashtable_bucket_t;
 
-#define HASH_SIZE      311   /* Should be prime */
-#define hash_inode(i)  ((i) % HASH_SIZE)
+#define HASH_SIZE      311u   /* Should be prime */
+#define hash_inode(i)  ((unsigned)(i) % HASH_SIZE)
 
 /* array of [HASH_SIZE] elements */
@@ -39 +48 @@
         if ((bucket->ino == statbuf->st_ino)
          && (bucket->dev == statbuf->st_dev)
+         && (bucket->isdir == !!S_ISDIR(statbuf->st_mode))
         ) {
             return bucket->name;
@@ -53 +63 @@
     ino_dev_hashtable_bucket_t *bucket;
 
-    i = hash_inode(statbuf->st_ino);
     if (!name)
         name = "";
@@ -59 +68 @@
     bucket->ino = statbuf->st_ino;
     bucket->dev = statbuf->st_dev;
+    bucket->isdir = !!S_ISDIR(statbuf->st_mode);
     strcpy(bucket->name, name);
 
@@ -64 +74 @@
         ino_dev_hashtable = xzalloc(HASH_SIZE * sizeof(*ino_dev_hashtable));
 
+    i = hash_inode(statbuf->st_ino);
     bucket->next = ino_dev_hashtable[i];
     ino_dev_hashtable[i] = bucket;
@@ -73 +84 @@
 {
     int i;
-    ino_dev_hashtable_bucket_t *bucket;
+    ino_dev_hashtable_bucket_t *bucket, *next;
 
-    for (i = 0; ino_dev_hashtable && i < HASH_SIZE; i++) {
-        while (ino_dev_hashtable[i] != NULL) {
-            bucket = ino_dev_hashtable[i]->next;
-            free(ino_dev_hashtable[i]);
-            ino_dev_hashtable[i] = bucket;
+    if (!ino_dev_hashtable)
+        return;
+
+    for (i = 0; i < HASH_SIZE; i++) {
+        bucket = ino_dev_hashtable[i];
+
+        while (bucket != NULL) {
+            next = bucket->next;
+            free(bucket);
+            bucket = next;
         }
     }