merged current version of git://git.denx.de/u-boot

[karo-tx-uboot.git] / lib / hashtable.c

diff --git a/lib/hashtable.c b/lib/hashtable.c
index 026dbca2fadecbd4533ca5d552973dc532d78c97..abd61c891861ee6c2c011beaac051c645e1222e6 100644 (file)
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -32,6 +32,7 @@
 #ifdef USE_HOSTCC              /* HOST build */
 # include <string.h>
 # include <assert.h>
+# include <ctype.h>
 
 # ifndef debug
 #  ifdef DEBUG
@@ -43,6 +44,7 @@
 #else                          /* U-Boot build */
 # include <common.h>
 # include <linux/string.h>
+# include <linux/ctype.h>
 #endif
 
 #ifndef        CONFIG_ENV_MIN_ENTRIES  /* minimum number of entries */
@@ -476,7 +478,8 @@ static int cmpkey(const void *p1, const void *p2)
 }
 
 ssize_t hexport_r(struct hsearch_data *htab, const char sep,
-                char **resp, size_t size)
+                char **resp, size_t size,
+                int argc, char * const argv[])
 {
        ENTRY *list[htab->size];
        char *res, *p;
@@ -489,8 +492,8 @@ ssize_t hexport_r(struct hsearch_data *htab, const char sep,
                return (-1);
        }
 
-       debug("EXPORT  table = %p, htab.size = %d, htab.filled = %d, size = %d\n",
-               htab, htab->size, htab->filled, size);
+       debug("EXPORT  table = %p, htab.size = %d, htab.filled = %d, "
+               "size = %zu\n", htab, htab->size, htab->filled, size);
        /*
         * Pass 1:
         * search used entries,
@@ -500,6 +503,16 @@ ssize_t hexport_r(struct hsearch_data *htab, const char sep,
 
                if (htab->table[i].used > 0) {
                        ENTRY *ep = &htab->table[i].entry;
+                       int arg, found = 0;
+
+                       for (arg = 0; arg < argc; ++arg) {
+                               if (strcmp(argv[arg], ep->key) == 0) {
+                                       found = 1;
+                                       break;
+                               }
+                       }
+                       if ((argc > 0) && (found == 0))
+                               continue;
 
                        list[n++] = ep;
 
@@ -537,8 +550,8 @@ ssize_t hexport_r(struct hsearch_data *htab, const char sep,
        /* Check if the user supplied buffer size is sufficient */
        if (size) {
                if (size < totlen + 1) {        /* provided buffer too small */
-                       debug("### buffer too small: %d, but need %d\n",
-                               size, totlen + 1);
+                       printf("Env export buffer too small: %zu, "
+                               "but need %zu\n", size, totlen + 1);
                        __set_errno(ENOMEM);
                        return (-1);
                }
@@ -638,7 +651,7 @@ int himport_r(struct hsearch_data *htab,
 
        /* we allocate new space to make sure we can write to the array */
        if ((data = malloc(size)) == NULL) {
-               debug("himport_r: can't malloc %d bytes\n", size);
+               debug("himport_r: can't malloc %zu bytes\n", size);
                __set_errno(ENOMEM);
                return 0;
        }
@@ -690,7 +703,7 @@ int himport_r(struct hsearch_data *htab,
                ENTRY e, *rv;
 
                /* skip leading white space */
-               while ((*dp == ' ') || (*dp == '\t'))
+               while (isblank(*dp))
                        ++dp;
 
                /* skip comment lines */