Happy New Year

[openldap] / libraries / liblmdb / mdb_load.c

diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c
index e0d95e13c3f6f006888e19b55d4f35a4d0c7eb80..417fad2e3a325b9cb3f18fccb62601597f119d1b 100644 (file)
--- a/libraries/liblmdb/mdb_load.c
+++ b/libraries/liblmdb/mdb_load.c
@@ -1,6 +1,6 @@
 /* mdb_load.c - memory-mapped database load tool */
 /*
- * Copyright 2011-2014 Howard Chu, Symas Corp.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@ static int mode;
 
 static char *subname = NULL;
 
-static size_t lineno;
+static mdb_size_t lineno;
 static int version;
 
 static int flags;
@@ -38,11 +38,7 @@ static MDB_envinfo info;
 
 static MDB_val kbuf, dbuf;
 
-#ifdef _WIN32
-#define Z      "I"
-#else
-#define Z      "z"
-#endif
+#define Yu     MDB_PRIy(u)
 
 #define STRLENOF(s)    (sizeof(s)-1)
 
@@ -73,7 +69,7 @@ static void readhdr(void)
                if (!strncmp(dbuf.mv_data, "VERSION=", STRLENOF("VERSION="))) {
                        version=atoi((char *)dbuf.mv_data+STRLENOF("VERSION="));
                        if (version > 3) {
-                               fprintf(stderr, "%s: line %" Z "d: unsupported VERSION %d\n",
+                               fprintf(stderr, "%s: line %"Yu": unsupported VERSION %d\n",
                                        prog, lineno, version);
                                exit(EXIT_FAILURE);
                        }
@@ -83,7 +79,7 @@ static void readhdr(void)
                        if (!strncmp((char *)dbuf.mv_data+STRLENOF("FORMAT="), "print", STRLENOF("print")))
                                mode |= PRINT;
                        else if (strncmp((char *)dbuf.mv_data+STRLENOF("FORMAT="), "bytevalue", STRLENOF("bytevalue"))) {
-                               fprintf(stderr, "%s: line %" Z "d: unsupported FORMAT %s\n",
+                               fprintf(stderr, "%s: line %"Yu": unsupported FORMAT %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("FORMAT="));
                                exit(EXIT_FAILURE);
                        }
@@ -94,7 +90,7 @@ static void readhdr(void)
                        subname = strdup((char *)dbuf.mv_data+STRLENOF("database="));
                } else if (!strncmp(dbuf.mv_data, "type=", STRLENOF("type="))) {
                        if (strncmp((char *)dbuf.mv_data+STRLENOF("type="), "btree", STRLENOF("btree")))  {
-                               fprintf(stderr, "%s: line %" Z "d: unsupported type %s\n",
+                               fprintf(stderr, "%s: line %"Yu": unsupported type %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("type="));
                                exit(EXIT_FAILURE);
                        }
@@ -104,7 +100,7 @@ static void readhdr(void)
                        if (ptr) *ptr = '\0';
                        i = sscanf((char *)dbuf.mv_data+STRLENOF("mapaddr="), "%p", &info.me_mapaddr);
                        if (i != 1) {
-                               fprintf(stderr, "%s: line %" Z "d: invalid mapaddr %s\n",
+                               fprintf(stderr, "%s: line %"Yu": invalid mapaddr %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("mapaddr="));
                                exit(EXIT_FAILURE);
                        }
@@ -112,9 +108,10 @@ static void readhdr(void)
                        int i;
                        ptr = memchr(dbuf.mv_data, '\n', dbuf.mv_size);
                        if (ptr) *ptr = '\0';
-                       i = sscanf((char *)dbuf.mv_data+STRLENOF("mapsize="), "%" Z "u", &info.me_mapsize);
+                       i = sscanf((char *)dbuf.mv_data+STRLENOF("mapsize="),
+                               "%" MDB_SCNy(u), &info.me_mapsize);
                        if (i != 1) {
-                               fprintf(stderr, "%s: line %" Z "d: invalid mapsize %s\n",
+                               fprintf(stderr, "%s: line %"Yu": invalid mapsize %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("mapsize="));
                                exit(EXIT_FAILURE);
                        }
@@ -124,7 +121,7 @@ static void readhdr(void)
                        if (ptr) *ptr = '\0';
                        i = sscanf((char *)dbuf.mv_data+STRLENOF("maxreaders="), "%u", &info.me_maxreaders);
                        if (i != 1) {
-                               fprintf(stderr, "%s: line %" Z "d: invalid maxreaders %s\n",
+                               fprintf(stderr, "%s: line %"Yu": invalid maxreaders %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("maxreaders="));
                                exit(EXIT_FAILURE);
                        }
@@ -140,12 +137,12 @@ static void readhdr(void)
                        if (!dbflags[i].bit) {
                                ptr = memchr(dbuf.mv_data, '=', dbuf.mv_size);
                                if (!ptr) {
-                                       fprintf(stderr, "%s: line %" Z "d: unexpected format\n",
+                                       fprintf(stderr, "%s: line %"Yu": unexpected format\n",
                                                prog, lineno);
                                        exit(EXIT_FAILURE);
                                } else {
                                        *ptr = '\0';
-                                       fprintf(stderr, "%s: line %" Z "d: unrecognized keyword ignored: %s\n",
+                                       fprintf(stderr, "%s: line %"Yu": unrecognized keyword ignored: %s\n",
                                                prog, lineno, (char *)dbuf.mv_data);
                                }
                        }
@@ -155,7 +152,7 @@ static void readhdr(void)
 
 static void badend(void)
 {
-       fprintf(stderr, "%s: line %" Z "d: unexpected end of input\n",
+       fprintf(stderr, "%s: line %"Yu": unexpected end of input\n",
                prog, lineno);
 }
 
@@ -176,7 +173,7 @@ static int unhex(unsigned char *c2)
 static int readline(MDB_val *out, MDB_val *buf)
 {
        unsigned char *c1, *c2, *end;
-       size_t len;
+       size_t len, l2;
        int c;
 
        if (!(mode & NOHDR)) {
@@ -206,28 +203,30 @@ badend:
 
        c1 = buf->mv_data;
        len = strlen((char *)c1);
+       l2 = len;
 
        /* Is buffer too short? */
        while (c1[len-1] != '\n') {
                buf->mv_data = realloc(buf->mv_data, buf->mv_size*2);
                if (!buf->mv_data) {
                        Eof = 1;
-                       fprintf(stderr, "%s: line %" Z "d: out of memory, line too long\n",
+                       fprintf(stderr, "%s: line %"Yu": out of memory, line too long\n",
                                prog, lineno);
                        return EOF;
                }
                c1 = buf->mv_data;
-               c1 += buf->mv_size;
-               if (fgets((char *)c1, buf->mv_size, stdin) == NULL) {
+               c1 += l2;
+               if (fgets((char *)c1, buf->mv_size+1, stdin) == NULL) {
                        Eof = 1;
                        badend();
                        return EOF;
                }
                buf->mv_size *= 2;
                len = strlen((char *)c1);
+               l2 += len;
        }
        c1 = c2 = buf->mv_data;
-       len = strlen((char *)c1);
+       len = l2;
        c1[--len] = '\0';
        end = c1 + len;
 
@@ -246,7 +245,8 @@ badend:
                                        c2 += 2;
                                }
                        } else {
-                               c1++; c2++;
+                               /* copies are redundant when no escapes were used */
+                               *c1++ = *c2++;
                        }
                }
        } else {
@@ -274,7 +274,7 @@ badend:
 
 static void usage(void)
 {
-       fprintf(stderr, "usage: %s dbpath [-V] [-f input] [-n] [-s name] [-N] [-T]\n", prog);
+       fprintf(stderr, "usage: %s [-V] [-f input] [-n] [-s name] [-N] [-T] dbpath\n", prog);
        exit(EXIT_FAILURE);
 }
 
@@ -325,7 +325,7 @@ int main(int argc, char *argv[])
                        putflags = MDB_NOOVERWRITE|MDB_NODUPDATA;
                        break;
                case 'T':
-                       mode |= NOHDR;
+                       mode |= NOHDR | PRINT;
                        break;
                default:
                        usage();
@@ -398,25 +398,27 @@ int main(int argc, char *argv[])
 
                while(1) {
                        rc = readline(&key, &kbuf);
-                       if (rc == EOF)
+                       if (rc)  /* rc == EOF */
                                break;
-                       if (rc)
-                               goto txn_abort;
 
                        rc = readline(&data, &dbuf);
-                       if (rc)
+                       if (rc) {
+                               fprintf(stderr, "%s: line %"Yu": failed to read key value\n", prog, lineno);
                                goto txn_abort;
-                       
+                       }
+
                        rc = mdb_cursor_put(mc, &key, &data, putflags);
                        if (rc == MDB_KEYEXIST && putflags)
                                continue;
-                       if (rc)
+                       if (rc) {
+                               fprintf(stderr, "mdb_cursor_put failed, error %d %s\n", rc, mdb_strerror(rc));
                                goto txn_abort;
+                       }
                        batch++;
                        if (batch == 100) {
                                rc = mdb_txn_commit(txn);
                                if (rc) {
-                                       fprintf(stderr, "%s: line %" Z "d: txn_commit: %s\n",
+                                       fprintf(stderr, "%s: line %"Yu": txn_commit: %s\n",
                                                prog, lineno, mdb_strerror(rc));
                                        goto env_close;
                                }
@@ -436,7 +438,7 @@ int main(int argc, char *argv[])
                rc = mdb_txn_commit(txn);
                txn = NULL;
                if (rc) {
-                       fprintf(stderr, "%s: line %" Z "d: txn_commit: %s\n",
+                       fprintf(stderr, "%s: line %"Yu": txn_commit: %s\n",
                                prog, lineno, mdb_strerror(rc));
                        goto env_close;
                }