Changeset 2c3da6 in git for Singular/ndbm.cc

Timestamp:

Dec 4, 1997, 4:21:15 PM (26 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

dbe33ad84b9082ecd9e8734be8728254ffdedec4

Parents:

c30084002d9743a446fe5e4c99701fefa1f99aba

Message:

Modified Files:
 	configure configure.in mod2.h.in ndbm.cc ChangeLog

	* ndbm.cc: don't replace bcopy by memcpy if possible, otherwise
	  the database (>1024 bytes) will be corrupted.
	- added check for bcopy() in configure.


git-svn-id: file:///usr/local/Singular/svn/trunk@944 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/ndbm.cc (modified) (10 diffs)

Singular/ndbm.cc

@@ -5 +5 @@
 //**************************************************************************/
 //
-// $Id: ndbm.cc,v 1.5 1997-10-09 13:04:07 obachman Exp $
+// $Id: ndbm.cc,v 1.6 1997-12-04 15:21:14 krueger Exp $
 //
 //**************************************************************************/
@@ -49 +49 @@
 #   include <fcntl.h>
 #endif /* macintosh */
+#ifndef HAVE_BCOPY
 #   define bcopy(a,b,c) memcpy(b,a,c)
-#   define bzero(a,b)   memset(a,0,b)
-#   define bcmp(a,b,c)  memcmp(a,b,c)
+#endif /* not HAVE_BCOPY */
 #include "ndbm.h"
 
@@ -229 +229 @@
     return (-1);
   }
-  bzero(ovfbuf, PBLKSIZ);
+  memset(ovfbuf, 0, PBLKSIZ);
   for (i=0;;) {
     item = makdatum(db->dbm_pagbuf, i);
@@ -288 +288 @@
       (void) lseek(db->dbm_pagf, db->dbm_blkptr*PBLKSIZ, L_SET);
       if (read(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ) != PBLKSIZ)
-        bzero(db->dbm_pagbuf, PBLKSIZ);
+        memset(db->dbm_pagbuf, 0, PBLKSIZ);
 #ifdef DEBUG
       else if (chkblk(db->dbm_pagbuf) < 0)
@@ -324 +324 @@
     (void) lseek(db->dbm_pagf, db->dbm_blkno*PBLKSIZ, L_SET);
     if (read(db->dbm_pagf, db->dbm_pagbuf, PBLKSIZ) != PBLKSIZ)
-      bzero(db->dbm_pagbuf, PBLKSIZ);
+      memset(db->dbm_pagbuf, 0, PBLKSIZ);
 #ifdef DEBUG
     else if (chkblk(db->dbm_pagbuf) < 0)
@@ -349 +349 @@
     (void) lseek(db->dbm_dirf, (long)b*DBLKSIZ, L_SET);
     if (read(db->dbm_dirf, db->dbm_dirbuf, DBLKSIZ) != DBLKSIZ)
-      bzero(db->dbm_dirbuf, DBLKSIZ);
+      memset(db->dbm_dirbuf, 0, DBLKSIZ);
   }
   return (db->dbm_dirbuf[i] & (1<<n));
@@ -370 +370 @@
     (void) lseek(db->dbm_dirf, (long)b*DBLKSIZ, L_SET);
     if (read(db->dbm_dirf, db->dbm_dirbuf, DBLKSIZ) != DBLKSIZ)
-      bzero(db->dbm_dirbuf, DBLKSIZ);
+      memset(db->dbm_dirbuf, 0, DBLKSIZ);
   }
   db->dbm_dirbuf[i] |= 1<<n;
@@ -412 +412 @@
     if (n != item.dsize)
       continue;
-    if (n == 0 || bcmp(&buf[sp[i+1]], item.dptr, n) == 0)
+    if (n == 0 || memcmp(&buf[sp[i+1]], item.dptr, n) == 0)
       return (i);
   }
@@ -524 +524 @@
 {
   register short *sp;
-  register i1, i2;
+  register i1, i2, tmp;
 
   sp = (short *)buf;
@@ -532 +532 @@
     i1 = sp[i2];
   i1 -= item.dsize + item1.dsize;
-  if (i1 <= (i2+3) * sizeof(short))
-    return (0);
+  tmp = (i2+3) * sizeof(short);
+  if (i1 <= tmp) return (0);
   sp[0] += 2;
   sp[++i2] = i1 + item1.dsize;