php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix various solaris problems by replacing stdio with posix io where possible

Browse Source
This commit is contained in:
Uwe Schindler
2005-04-15 09:14:38 +00:00
parent 6ead36dcf4
commit c4e788b03c
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ext/standard/md5.c
View File

@@ -23,9 +23,10 @@
* md5_file() added by Alessandro Astarita <aleast@capri.it>
*/
#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 @@ PHP_NAMED_FUNCTION(php_if_md5_file)
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 @@ PHP_NAMED_FUNCTION(php_if_md5_file)
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);

17
ext/standard/sha1.c
View File

@@ -18,8 +18,10 @@
/* $Id$ */
#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 @@ PHP_FUNCTION(sha1_file)
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 @@ PHP_FUNCTION(sha1_file)
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);