Changeset 392 for branches/samba-3.0/source/tdb/tools

Timestamp:

Jan 21, 2010, 5:06:42 PM (16 years ago)

Author:

Silvan Scherrer

Message:

fixed ticket 112 in 3.0

File:

• branches/samba-3.0/source/tdb/tools/tdbtool.c (modified) (7 diffs)

branches/samba-3.0/source/tdb/tools/tdbtool.c

@@ -46 +46 @@
 TDB_DATA iterate_kbuf;
 char cmdline[1024];
+
+#ifdef __OS2__
+static int createDbCmd;
+#endif
 
 enum commands {
@@ -215 +219 @@
         tdb = tdb_open(tdbname, 0, TDB_CLEAR_IF_FIRST,
                        O_RDWR | O_CREAT | O_TRUNC, 0600);
+#ifdef __OS2__
+        if (!tdb && !createDbCmd) {
+#else
         if (!tdb) {
+#endif
                 printf("Could not create %s: %s\n", tdbname, strerror(errno));
         }
@@ -494 +502 @@
 
         do_connections = 0;
+
+#ifdef __OS2__
+    if (cmdname) {
+#endif
 
         if (cmdname && strlen(cmdname) == 0) {
@@ -507 +519 @@
             }
         }
+
+#ifdef __OS2__
+    }
+#endif
 
         switch (mycmd) {
@@ -645 +661 @@
     arg2 = NULL;
     arg2len = 0;
-#if defined(__OS2__)
-    if (argv[1] && argc == 2) {
-#else
+
+#ifdef __OS2__
+        int cnt = 1;
+        createDbCmd = 0;
+        while (argv[cnt]) {
+                if (strncmp("create",argv[cnt],6) == 0) {
+                        createDbCmd = 1;
+                        break;
+                }
+                cnt++;
+        }
+#endif
+
     if (argv[1])  {
-#endif
         cmdname = (char *) "open";
         arg1 = argv[1];
@@ -681 +706 @@
             }
             break;
-#if defined(__OS2__)
-        case 5:
-        case 4:
-                arg2 = convert_string(argv[3],&arg2len);
-        case 3:
-                arg1 = convert_string(argv[2],&arg1len);
-        cmdname = argv[1];
-#else
         case 5:
                 arg2 = convert_string(argv[4],&arg2len);
@@ -695 +712 @@
         case 3:
                 cmdname = argv[2];
+        default:
+#ifdef __OS2__
+            if (argc == 3) {
+               arg1 = convert_string(argv[1], &arg1len);
+            }
 #endif
-            
-        default:
             do_command();
             break;