picolisp

commit 47df749836353ff5ab0487c39e0ae0b75b9bb04f
parent 92db19a4c928b4cecb80063633db3bec4d6dc246
Author: Commit-Bot <unknown>
Date:   Mon, 30 Aug 2010 15:48:32 +0000

Automatic commit from picoLisp.tgz, From: Mon, 30 Aug 2010 15:48:32 GMT
Diffstat:
M
lib/tags
 | 
22
+++++++++++-----------
M
src/io.c
 | 
4
----
M
src64/db.l
 | 
8
++------

3 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/lib/tags b/lib/tags
@@ -90,7 +90,7 @@ close (4182 . "@src64/io.l")
 cmd (2846 . "@src64/main.l")
 cnt (1297 . "@src64/apply.l")
 co (2566 . "@src64/flow.l")
-commit (1497 . "@src64/db.l")
+commit (1493 . "@src64/db.l")
 con (725 . "@src64/subr.l")
 conc (781 . "@src64/subr.l")
 cond (1938 . "@src64/flow.l")
@@ -101,7 +101,7 @@ ctl (4122 . "@src64/io.l")
 ctty (2644 . "@src64/main.l")
 cut (1797 . "@src64/sym.l")
 date (2358 . "@src64/main.l")
-dbck (2086 . "@src64/db.l")
+dbck (2082 . "@src64/db.l")
 de (549 . "@src64/flow.l")
 dec (2323 . "@src64/big.l")
 def (473 . "@src64/flow.l")
@@ -140,7 +140,7 @@ fold (3345 . "@src64/sym.l")
 for (2247 . "@src64/flow.l")
 fork (3269 . "@src64/flow.l")
 format (2089 . "@src64/big.l")
-free (2028 . "@src64/db.l")
+free (2024 . "@src64/db.l")
 from (3372 . "@src64/io.l")
 full (1066 . "@src64/subr.l")
 fun? (734 . "@src64/sym.l")
@@ -155,7 +155,7 @@ head (1807 . "@src64/subr.l")
 heap (542 . "@src64/main.l")
 hear (3094 . "@src64/io.l")
 host (184 . "@src64/net.l")
-id (1028 . "@src64/db.l")
+id (1024 . "@src64/db.l")
 idx (2037 . "@src64/sym.l")
 if (1824 . "@src64/flow.l")
 if2 (1843 . "@src64/flow.l")
@@ -168,14 +168,14 @@ intern (875 . "@src64/sym.l")
 ipid (3214 . "@src64/flow.l")
 isa (978 . "@src64/flow.l")
 job (1448 . "@src64/flow.l")
-journal (971 . "@src64/db.l")
+journal (967 . "@src64/db.l")
 key (3203 . "@src64/io.l")
 kill (3246 . "@src64/flow.l")
 last (2031 . "@src64/subr.l")
 length (2687 . "@src64/subr.l")
 let (1498 . "@src64/flow.l")
 let? (1559 . "@src64/flow.l")
-lieu (1157 . "@src64/db.l")
+lieu (1153 . "@src64/db.l")
 line (3528 . "@src64/io.l")
 lines (3681 . "@src64/io.l")
 link (1163 . "@src64/subr.l")
@@ -184,7 +184,7 @@ list (887 . "@src64/subr.l")
 listen (151 . "@src64/net.l")
 lit (183 . "@src64/flow.l")
 load (3995 . "@src64/io.l")
-lock (1185 . "@src64/db.l")
+lock (1181 . "@src64/db.l")
 loop (2190 . "@src64/flow.l")
 low? (3217 . "@src64/sym.l")
 lowc (3247 . "@src64/sym.l")
@@ -200,7 +200,7 @@ mapcar (871 . "@src64/apply.l")
 mapcon (925 . "@src64/apply.l")
 maplist (817 . "@src64/apply.l")
 maps (674 . "@src64/apply.l")
-mark (1946 . "@src64/db.l")
+mark (1942 . "@src64/db.l")
 match (3062 . "@src64/subr.l")
 max (2314 . "@src64/subr.l")
 maxi (1395 . "@src64/apply.l")
@@ -248,7 +248,7 @@ pick (1253 . "@src64/apply.l")
 pid (157 . "@src64/flow.l")
 pipe (4059 . "@src64/io.l")
 poll (3156 . "@src64/io.l")
-pool (651 . "@src64/db.l")
+pool (647 . "@src64/db.l")
 pop (1773 . "@src64/sym.l")
 port (5 . "@src64/net.l")
 pr (5033 . "@src64/io.l")
@@ -282,7 +282,7 @@ replace (1490 . "@src64/subr.l")
 rest (2272 . "@src64/main.l")
 reverse (1665 . "@src64/subr.l")
 rewind (4925 . "@src64/io.l")
-rollback (1879 . "@src64/db.l")
+rollback (1875 . "@src64/db.l")
 rot (848 . "@src64/subr.l")
 rpc (5066 . "@src64/io.l")
 run (331 . "@src64/flow.l")
@@ -290,7 +290,7 @@ sect (2515 . "@src64/subr.l")
 seed (2944 . "@src64/big.l")
 seek (1159 . "@src64/apply.l")
 send (1150 . "@src64/flow.l")
-seq (1084 . "@src64/db.l")
+seq (1080 . "@src64/db.l")
 set (1482 . "@src64/sym.l")
 setq (1515 . "@src64/sym.l")
 sigio (503 . "@src64/main.l")
diff --git a/src/io.c b/src/io.c
@@ -2721,10 +2721,6 @@ static pid_t tryLock(off_t n, off_t len) {
       }
       if (errno != EINTR  &&  errno != EACCES  &&  errno != EAGAIN)
          lockErr();
-      fl.l_type = F_WRLCK;
-      fl.l_whence = SEEK_SET;
-      fl.l_start = n;
-      fl.l_len = len;
       while (fcntl(BlkFile[F], F_GETLK, &fl) < 0)
          if (errno != EINTR)
             lockErr();
diff --git a/src64/db.l b/src64/db.l
@@ -298,10 +298,10 @@
 
 (code 'tryLockCE_FA)
    do
-      ld (Flock L_START) C  # Start position ('l_whence' is SEEK_SET)
-      ld (Flock L_LEN) E  # Length
       ld A F_WRLCK  # Write lock
       st2 (Flock)  # 'l_type'
+      ld (Flock L_START) C  # Start position ('l_whence' is SEEK_SET)
+      ld (Flock L_LEN) E  # Length
       cc fcntl(((DbFile)) F_SETLK Flock)  # Try to lock
       nul4  # OK?
       if ns  # Yes
@@ -327,10 +327,6 @@
             jne lockErr  # No
          end
       end
-      ld A F_WRLCK  # Write lock
-      st2 (Flock)  # 'l_type'
-      ld (Flock L_START) C  # Start position ('l_whence' is SEEK_SET)
-      ld (Flock L_LEN) E  # Length
       do
          cc fcntl(((DbFile)) F_GETLK Flock)  # Try to get lock
          nul4  # OK?