helly Wed Nov 13 05:17:19 2002 EDT
Modified files:
/php4/ext/db db.c
Log:
avoid fileno()
Index: php4/ext/db/db.c
diff -u php4/ext/db/db.c:1.80 php4/ext/db/db.c:1.81
--- php4/ext/db/db.c:1.80 Tue Nov 12 07:01:57 2002
+++ php4/ext/db/db.c Wed Nov 13 05:17:19 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: db.c,v 1.80 2002/11/12 12:01:57 helly Exp $ */
+/* $Id: db.c,v 1.81 2002/11/13 10:17:19 helly Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -916,17 +916,17 @@
fseek(dbf, 0L, SEEK_END);
fprintf(dbf, "%d\n", key_datum.dsize);
fflush(dbf);
- ret = write(fileno(dbf), key_datum.dptr, key_datum.dsize);
+ ret = fwrite(key_datum.dptr, sizeof(char), key_datum.dsize, dbf);
fprintf(dbf, "%d\n", value_datum.dsize);
fflush(dbf);
- ret = write(fileno(dbf), value_datum.dptr, value_datum.dsize);
+ ret = fwrite(value_datum.dptr, sizeof(char), value_datum.dsize, dbf);
} else { /* DBM_REPLACE */
flatfile_delete(dbf, key_datum);
fprintf(dbf, "%d\n", key_datum.dsize);
fflush(dbf);
- ret = write(fileno(dbf), key_datum.dptr, key_datum.dsize);
+ ret = fwrite(key_datum.dptr, sizeof(char), key_datum.dsize, dbf);
fprintf(dbf, "%d\n", value_datum.dsize);
- ret = write(fileno(dbf), value_datum.dptr, value_datum.dsize);
+ ret = fwrite(value_datum.dptr, sizeof(char), value_datum.dsize, dbf);
}
if (ret>0)
@@ -950,7 +950,7 @@
buf_size+=num;
buf = erealloc(buf, (buf_size+1)*sizeof(char));
}
- read(fileno(dbf), buf, num);
+ fread(buf, sizeof(char), num, dbf);
value_datum.dptr = buf;
value_datum.dsize = num;
}
@@ -1079,7 +1079,7 @@
if (buf.dptr) efree(buf.dptr);
buf.dptr = emalloc((buf_size+1)*sizeof(char));
}
- num=read(fileno(dbf), buf.dptr, num);
+ num = fread(buf.dptr, sizeof(char), num, dbf);
if (num<0) break;
buf.dsize = num;
if (*(buf.dptr)!=0) {
@@ -1093,7 +1093,7 @@
if (buf.dptr) efree(buf.dptr);
buf.dptr = emalloc((buf_size+1)*sizeof(char));
}
- num=read(fileno(dbf), buf.dptr, num);
+ num = fread(buf.dptr, sizeof(char), num, dbf);
if (num<0) break;
}
if (buf.dptr) efree(buf.dptr);
@@ -1119,7 +1119,7 @@
if (buf.dptr) efree(buf.dptr);
buf.dptr = emalloc((buf_size+1)*sizeof(char));
}
- num=read(fileno(dbf), buf.dptr, num);
+ num = fread(buf.dptr, sizeof(char), num, dbf);
if (num<0) break;
if (!fgets(buf.dptr, 15, dbf)) break;
num = atoi(buf.dptr);
@@ -1128,7 +1128,7 @@
if (buf.dptr) efree(buf.dptr);
buf.dptr = emalloc((buf_size+1)*sizeof(char));
}
- num=read(fileno(dbf), buf.dptr, num);
+ num = fread(buf.dptr, sizeof(char), num, dbf);
if (num<0) break;
buf.dsize = num;
if (*(buf.dptr)!=0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
