ash: builtin: Mark more regular built-ins

[oweals/busybox.git] / libbb / inode_hash.c

diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c
index 2ac1623f4e69673e914fd063f71055fbded6cdaa..a125244ca72f1d012adc1ee63120cfb6fc1362ed 100644 (file)
--- a/libbb/inode_hash.c
+++ b/libbb/inode_hash.c
@@ -5,84 +5,98 @@
  * Copyright (C) many different people.
  * If you wrote this, please acknowledge your work.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "libbb.h"
 
-#define HASH_SIZE      311             /* Should be prime */
-#define hash_inode(i)  ((i) % HASH_SIZE)
-
 typedef struct ino_dev_hash_bucket_struct {
-  struct ino_dev_hash_bucket_struct *next;
-  ino_t ino;
-  dev_t dev;
-  char name[1];
+       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;
 
-static ino_dev_hashtable_bucket_t *ino_dev_hashtable[HASH_SIZE];
+#define HASH_SIZE      311u   /* Should be prime */
+#define hash_inode(i)  ((unsigned)(i) % HASH_SIZE)
+
+/* array of [HASH_SIZE] elements */
+static ino_dev_hashtable_bucket_t **ino_dev_hashtable;
 
 /*
- * Return 1 if statbuf->st_ino && statbuf->st_dev are recorded in
- * `ino_dev_hashtable', else return 0
- *
- * If NAME is a non-NULL pointer to a character pointer, and there is
- * a match, then set *NAME to the value of the name slot in that
- * bucket.
+ * Return name if statbuf->st_ino && statbuf->st_dev are recorded in
+ * ino_dev_hashtable, else return NULL
  */
-int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name)
+char* FAST_FUNC is_in_ino_dev_hashtable(const struct stat *statbuf)
 {
        ino_dev_hashtable_bucket_t *bucket;
 
+       if (!ino_dev_hashtable)
+               return NULL;
+
        bucket = ino_dev_hashtable[hash_inode(statbuf->st_ino)];
        while (bucket != NULL) {
-         if ((bucket->ino == statbuf->st_ino) &&
-                 (bucket->dev == statbuf->st_dev))
-         {
-               if (name) *name = bucket->name;
-               return 1;
-         }
-         bucket = bucket->next;
+               if ((bucket->ino == statbuf->st_ino)
+                && (bucket->dev == statbuf->st_dev)
+                && (bucket->isdir == !!S_ISDIR(statbuf->st_mode))
+               ) {
+                       return bucket->name;
+               }
+               bucket = bucket->next;
        }
-       return 0;
+       return NULL;
 }
 
 /* Add statbuf to statbuf hash table */
-void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
+void FAST_FUNC add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
 {
        int i;
-       size_t s;
        ino_dev_hashtable_bucket_t *bucket;
 
-       i = hash_inode(statbuf->st_ino);
-       s = name ? strlen(name) : 0;
-       bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + s);
+       if (!name)
+               name = "";
+       bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + strlen(name));
        bucket->ino = statbuf->st_ino;
        bucket->dev = statbuf->st_dev;
-       if (name)
-               strcpy(bucket->name, name);
-       else
-               bucket->name[0] = '\0';
+       bucket->isdir = !!S_ISDIR(statbuf->st_mode);
+       strcpy(bucket->name, name);
+
+       if (!ino_dev_hashtable)
+               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;
 }
 
-#ifdef CONFIG_FEATURE_CLEAN_UP
+#if ENABLE_FEATURE_CLEAN_UP
 /* Clear statbuf hash table */
-void reset_ino_dev_hashtable(void)
+void FAST_FUNC reset_ino_dev_hashtable(void)
 {
        int i;
-       ino_dev_hashtable_bucket_t *bucket;
+       ino_dev_hashtable_bucket_t *bucket, *next;
+
+       if (!ino_dev_hashtable)
+               return;
 
        for (i = 0; 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;
+               bucket = ino_dev_hashtable[i];
+
+               while (bucket != NULL) {
+                       next = bucket->next;
+                       free(bucket);
+                       bucket = next;
                }
        }
+       free(ino_dev_hashtable);
+       ino_dev_hashtable = NULL;
 }
 #endif