Happy New Year

[openldap] / libraries / liblmdb / mdb_copy.c

diff --git a/libraries/liblmdb/mdb_copy.c b/libraries/liblmdb/mdb_copy.c
index 0814519d4d2d4061bde6953eea4ecd743c974d41..1b89396eb9de4e7e4c88d82c2f276c9c602a3113 100644 (file)
--- a/libraries/liblmdb/mdb_copy.c
+++ b/libraries/liblmdb/mdb_copy.c
@@ -1,6 +1,6 @@
 /* mdb_copy.c - memory-mapped database backup tool */
 /*
- * Copyright 2012 Howard Chu, Symas Corp.
+ * Copyright 2012-2018 Howard Chu, Symas Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,13 +33,13 @@ int main(int argc,char * argv[])
        MDB_env *env;
        const char *progname = argv[0], *act;
        unsigned flags = MDB_RDONLY;
-       int compact = 0;
+       unsigned cpflags = 0;
 
        for (; argc > 1 && argv[1][0] == '-'; argc--, argv++) {
                if (argv[1][1] == 'n' && argv[1][2] == '\0')
                        flags |= MDB_NOSUBDIR;
                else if (argv[1][1] == 'c' && argv[1][2] == '\0')
-                       compact = 1;
+                       cpflags |= MDB_CP_COMPACT;
                else if (argv[1][1] == 'V' && argv[1][2] == '\0') {
                        printf("%s\n", MDB_VERSION_STRING);
                        exit(0);
@@ -64,21 +64,14 @@ int main(int argc,char * argv[])
        act = "opening environment";
        rc = mdb_env_create(&env);
        if (rc == MDB_SUCCESS) {
-               rc = mdb_env_open(env, argv[1], flags, 0);
+               rc = mdb_env_open(env, argv[1], flags, 0600);
        }
        if (rc == MDB_SUCCESS) {
                act = "copying";
-               if (compact) {
-                       if (argc == 2)
-                               rc = mdb_env_copyfd2(env, MDB_STDOUT);
-                       else
-                               rc = mdb_env_copy2(env, argv[2]);
-               } else {
-                       if (argc == 2)
-                               rc = mdb_env_copyfd(env, MDB_STDOUT);
-                       else
-                               rc = mdb_env_copy(env, argv[2]);
-               }
+               if (argc == 2)
+                       rc = mdb_env_copyfd2(env, MDB_STDOUT, cpflags);
+               else
+                       rc = mdb_env_copy2(env, argv[2], cpflags);
        }
        if (rc)
                fprintf(stderr, "%s: %s failed, error %d (%s)\n",