Changeset 866

Timestamp:

May 22, 2014, 12:01:24 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SambaServer: better version for creating AL files

Location:

trunk/server/lib/tdb/common

Files:

• io.c (modified) (1 diff)
• open.c (modified) (5 diffs)

trunk/server/lib/tdb/common/io.c

@@ -110 +110 @@
                 upgradeLockRC = tdb_brlock(tdb, F_WRLCK, off, len, TDB_LOCK_NOWAIT);
         }
+        // no need to log a successful upgrade
+        if (upgradeLockRC != 0)
         TDB_LOG((tdb, TDB_DEBUG_TRACE,"upgrading lock at %d len=%d "
                 "before writing %s (rc=%d).\n", off, len,

trunk/server/lib/tdb/common/open.c

@@ -304 +304 @@
 
 #ifdef __OS2__
-        if (os2_crtActiveLock(tdb, name, 1, mode) != 0)
+        if (os2_crtActiveLock(tdb, name, "tdb_open_ex") != 0)
                 goto fail;
 #endif
@@ -623 +623 @@
         tdb->hActiveLock = -1;
 
-        if (os2_crtActiveLock(tdb, tdb->name, 0, 0) != 0)
+        if (os2_crtActiveLock(tdb, tdb->name, "tdb_reopen") != 0)
                 goto fail;
 #endif
@@ -680 +680 @@
 }
 #ifdef __OS2__
-int os2_crtActiveLock(struct tdb_context *tdb, const char *name, const int truncate, const int mode)
+int os2_crtActiveLock(struct tdb_context *tdb, const char *name, const char *origin)
 {
         // name could be null, so handle it
@@ -686 +686 @@
                 return 0;
 
+        struct stat st;
+        bool emptytdb = false;
         char activeLockName[_MAX_PATH];
+        char *emptyString = "used for active lock\n\0";
         sprintf(activeLockName, "%s_AL", name);
+
+        if ((stat(activeLockName, &st) == -1) || (st.st_size < strlen(emptyString)))
+                emptytdb = true;
+
         tdb->hActiveLock = open(activeLockName, tdb->open_flags | O_CREAT, 0777);
         if (tdb->hActiveLock == -1) {
                 TDB_LOG((tdb, TDB_DEBUG_ERROR, "os2_crtActiveLock: cannot create activeLock %s called from %s %s\n",
-                        activeLockName, truncate?"tdb_open_ex":"tdb_reopen", strerror(errno)));
+                        activeLockName, origin, strerror(errno)));
                 errno = EINVAL;
                 return -1;
@@ -698 +705 @@
         // we try to truncate the db when called from tdb_open_ex
         // but if it's not working it's ok as well
-        if (truncate) { 
-                if (lseek(tdb->hActiveLock, 0, SEEK_SET) == -1)
-                        return 0;
-
-                if (ftruncate(tdb->hActiveLock, 0) == -1)
-                        return 0;
-
-                tdb_write_all(tdb->hActiveLock, "used for active lock\n", 21);
-        }
+        if (emptytdb)
+                tdb_write_all(tdb->hActiveLock, emptyString, strlen(emptyString));
 
         return 0;