Changeset 456 for trunk/server/lib/tdb/tools

Timestamp:

Jun 7, 2010, 9:08:40 AM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: changes from 3.3

File:

• trunk/server/lib/tdb/tools/tdbtool.c (modified) (6 diffs)

trunk/server/lib/tdb/tools/tdbtool.c

@@ -37 +37 @@
 char cmdline[1024];
 static int disable_mmap;
+
+#ifdef __OS2__
+static bool createDbCmd;
+#endif
 
 enum commands {
@@ -239 +243 @@
         tdb = tdb_open_ex(tdbname, 0, disable_mmap?TDB_NOMMAP:0, O_RDWR, 0600,
                           &log_ctx, NULL);
+#ifdef __OS2__
+        if (!tdb && !createDbCmd) {
+#else
         if (!tdb) {
+#endif
                 printf("Could not open %s: %s\n", tdbname, strerror(errno));
         }
@@ -563 +571 @@
         int cmd_len;
 
+#ifdef __OS2__
+    if (cmdname) {
+#endif
+
         if (cmdname && strlen(cmdname) == 0) {
                 mycmd = CMD_NEXT;
@@ -575 +587 @@
                 }
         }
+#ifdef __OS2__
+   }
+#endif
 
         switch (mycmd) {
@@ -730 +745 @@
         arg2 = NULL;
         arg2len = 0;
+
+#ifdef __OS2__
+        int cnt = 1;
+        createDbCmd = false;
+        while (argv[cnt]) {
+                if (strncmp("create",argv[cnt],6) == 0) {
+                        createDbCmd = true;
+                        break;
+                }
+                cnt++;
+        }
+#endif
 
         if (argv[1]) {
@@ -770 +797 @@
                 cmdname = argv[2];
         default:
+#ifdef __OS2__
+            if (argc == 3) {
+               arg1 = convert_string(argv[1], &arg1len);
+            }
+#endif
                 do_command();
                 break;