thetaphi Fri Apr 15 05:14:53 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard md5.c sha1.c
Log:
MFH: fix various solaris problems by replacing stdio with posix io where
possible
http://cvs.php.net/diff.php/php-src/ext/standard/md5.c?r1=1.35&r2=1.35.2.1&ty=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.35 php-src/ext/standard/md5.c:1.35.2.1
--- php-src/ext/standard/md5.c:1.35 Thu Jan 8 03:17:33 2004
+++ php-src/ext/standard/md5.c Fri Apr 15 05:14:53 2005
@@ -16,16 +16,17 @@
+----------------------------------------------------------------------+
*/
-/* $Id: md5.c,v 1.35 2004/01/08 08:17:33 andi Exp $ */
+/* $Id: md5.c,v 1.35.2.1 2005/04/15 09:14:53 thetaphi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
* md5_file() added by Alessandro Astarita <[EMAIL PROTECTED]>
*/
-#include <stdio.h>
#include "php.h"
-
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include "md5.h"
PHPAPI void make_digest(char *md5str, unsigned char *digest)
@@ -80,8 +81,7 @@
unsigned char buf[1024];
unsigned char digest[16];
PHP_MD5_CTX context;
- int n;
- FILE *fp;
+ int n,fd;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &arg,
&arg_len, &raw_output) == FAILURE) {
return;
@@ -95,25 +95,25 @@
RETURN_FALSE;
}
- if ((fp = VCWD_FOPEN(arg, "rb")) == NULL) {
+ if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open
file");
RETURN_FALSE;
}
PHP_MD5Init(&context);
- while ((n = fread(buf, 1, sizeof(buf), fp)) > 0) {
+ while ((n = read(fd, buf, sizeof(buf))) > 0) {
PHP_MD5Update(&context, buf, n);
}
PHP_MD5Final(digest, &context);
- if (ferror(fp)) {
- fclose(fp);
+ if (n<0) {
+ close(fd);
RETURN_FALSE;
}
- fclose(fp);
+ close(fd);
if (raw_output) {
RETURN_STRINGL(digest, 16, 1);
http://cvs.php.net/diff.php/php-src/ext/standard/sha1.c?r1=1.9&r2=1.9.2.1&ty=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.9 php-src/ext/standard/sha1.c:1.9.2.1
--- php-src/ext/standard/sha1.c:1.9 Thu Jan 8 03:17:34 2004
+++ php-src/ext/standard/sha1.c Fri Apr 15 05:14:53 2005
@@ -16,10 +16,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sha1.c,v 1.9 2004/01/08 08:17:34 andi Exp $ */
+/* $Id: sha1.c,v 1.9.2.1 2005/04/15 09:14:53 thetaphi Exp $ */
-#include <stdio.h>
#include "php.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
/* This code is heavily based on the PHP md5 implementation */
@@ -78,8 +80,7 @@
unsigned char buf[1024];
unsigned char digest[20];
PHP_SHA1_CTX context;
- int n;
- FILE *fp;
+ int n, fd;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &arg,
&arg_len, &raw_output) == FAILURE) {
return;
@@ -93,25 +94,25 @@
RETURN_FALSE;
}
- if ((fp = VCWD_FOPEN(arg, "rb")) == NULL) {
+ if ((fd = VCWD_OPEN(arg, O_RDONLY)) == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open
file");
RETURN_FALSE;
}
PHP_SHA1Init(&context);
- while ((n = fread(buf, 1, sizeof(buf), fp)) > 0) {
+ while ((n = read(fd, buf, sizeof(buf))) > 0) {
PHP_SHA1Update(&context, buf, n);
}
PHP_SHA1Final(digest, &context);
- if (ferror(fp)) {
- fclose(fp);
+ if (n<0) {
+ close(fd);
RETURN_FALSE;
}
- fclose(fp);
+ close(fd);
if (raw_output) {
RETURN_STRINGL(digest, 20, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
