From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/libbb/inode_hash.c | 101 +++++++++++--------------- 1 file changed, 41 insertions(+), 60 deletions(-) (limited to 'release/src/router/busybox/libbb/inode_hash.c') diff --git a/release/src/router/busybox/libbb/inode_hash.c b/release/src/router/busybox/libbb/inode_hash.c index 790af8f3..b32bd26b 100644 --- a/release/src/router/busybox/libbb/inode_hash.c +++ b/release/src/router/busybox/libbb/inode_hash.c @@ -2,105 +2,86 @@ /* * Utility routines. * - * Copyright (C) tons of folks. Tracking down who wrote what - * isn't something I'm going to worry about... If you wrote something - * here, please feel free to acknowledge your work. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Based in part on code from sash, Copyright (c) 1999 by David I. Bell - * Permission has been granted to redistribute this code under the GPL. + * 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. */ -#include -#include -#include #include "libbb.h" +typedef struct ino_dev_hash_bucket_struct { + struct ino_dev_hash_bucket_struct *next; + ino_t ino; + dev_t dev; + char name[1]; +} ino_dev_hashtable_bucket_t; + #define HASH_SIZE 311 /* Should be prime */ #define hash_inode(i) ((i) % HASH_SIZE) -static ino_dev_hashtable_bucket_t *ino_dev_hashtable[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) + ) { + 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'; + strcpy(bucket->name, name); + + if (!ino_dev_hashtable) + ino_dev_hashtable = xzalloc(HASH_SIZE * sizeof(*ino_dev_hashtable)); + bucket->next = ino_dev_hashtable[i]; ino_dev_hashtable[i] = bucket; } +#if ENABLE_DU || 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; - for (i = 0; i < HASH_SIZE; i++) { + 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; } } + free(ino_dev_hashtable); + ino_dev_hashtable = NULL; } - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ +#endif -- cgit v1.2.3-54-g00ecf