Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

WS & CS fixes

migration/unlabaled-1.3.2
foobar 24 years ago
parent
eccecff5f9
commit
fb2c346be1
1 changed files with 81 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 166
      ext/dio/dio.c

166
ext/dio/dio.c
View File

@ -43,11 +43,10 @@ function_entry dio_functions[] = {
PHP_FE(dio_read, NULL) PHP_FE(dio_read, NULL)
PHP_FE(dio_write, NULL) PHP_FE(dio_write, NULL)
PHP_FE(dio_close, NULL) PHP_FE(dio_close, NULL)
PHP_FE(dio_tcsetattr, NULL)
PHP_FE(dio_tcsetattr, NULL)
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
zend_module_entry dio_module_entry = { zend_module_entry dio_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
"dio", "dio",
@ -61,12 +60,10 @@ zend_module_entry dio_module_entry = {
STANDARD_MODULE_PROPERTIES STANDARD_MODULE_PROPERTIES
}; };
#ifdef COMPILE_DL_DIO #ifdef COMPILE_DL_DIO
ZEND_GET_MODULE(dio) ZEND_GET_MODULE(dio)
#endif #endif
static void _dio_close_fd(zend_rsrc_list_entry *rsrc TSRMLS_DC) static void _dio_close_fd(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{ {
php_fd_t *f = (php_fd_t *) rsrc->ptr; php_fd_t *f = (php_fd_t *) rsrc->ptr;
@ -75,7 +72,6 @@ static void _dio_close_fd(zend_rsrc_list_entry *rsrc TSRMLS_DC)
} }
#define RDIOC(c) REGISTER_LONG_CONSTANT(#c, c, CONST_CS | CONST_PERSISTENT) #define RDIOC(c) REGISTER_LONG_CONSTANT(#c, c, CONST_CS | CONST_PERSISTENT)
#define DIO_UNDEF_CONST -1 #define DIO_UNDEF_CONST -1
PHP_MINIT_FUNCTION(dio) PHP_MINIT_FUNCTION(dio)
@ -183,6 +179,7 @@ PHP_FUNCTION(dio_read)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &r_fd, &bytes) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &r_fd, &bytes) == FAILURE) {
return; return;
} }
ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
data = emalloc(bytes + 1); data = emalloc(bytes + 1);
@ -213,6 +210,7 @@ PHP_FUNCTION(dio_write)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &r_fd, &data, &data_len, &trunc_len) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &r_fd, &data, &data_len, &trunc_len) == FAILURE) {
return; return;
} }
ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
res = write(f->fd, data, trunc_len ? trunc_len : data_len); res = write(f->fd, data, trunc_len ? trunc_len : data_len);
@ -235,6 +233,7 @@ PHP_FUNCTION(dio_truncate)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &r_fd, &offset) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &r_fd, &offset) == FAILURE) {
return; return;
} }
ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
if (ftruncate(f->fd, offset) == -1) { if (ftruncate(f->fd, offset) == -1) {
@ -259,6 +258,7 @@ PHP_FUNCTION(dio_stat)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &r_fd) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &r_fd) == FAILURE) {
return; return;
} }
ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
if (fstat(f->fd, &s) == -1) { if (fstat(f->fd, &s) == -1) {
@ -295,6 +295,7 @@ PHP_FUNCTION(dio_seek)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &r_fd, &offset, &whence) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &r_fd, &offset, &whence) == FAILURE) {
return; return;
} }
ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
RETURN_LONG(lseek(f->fd, offset, whence)); RETURN_LONG(lseek(f->fd, offset, whence));
@ -313,99 +314,95 @@ PHP_FUNCTION(dio_fcntl)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &r_fd, &cmd, &arg) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &r_fd, &cmd, &arg) == FAILURE) {
return; return;
} }
ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
switch (cmd) { switch (cmd) {
case F_SETLK:
case F_SETLKW: {
zval **element;
struct flock lk = {0};
HashTable *fh;
if (!arg) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be array or int, none given");
RETURN_FALSE;
}
if (Z_TYPE_P(arg) == IS_ARRAY) {
fh = HASH_OF(arg);
if (zend_hash_find(fh, "start", sizeof("start"), (void **) &element) == FAILURE) {
lk.l_start = 0;
}
else {
lk.l_start = Z_LVAL_PP(element);
}
if (zend_hash_find(fh, "length", sizeof("length"), (void **) &element) == FAILURE) {
lk.l_len = 0;
}
else {
lk.l_len = Z_LVAL_PP(element);
case F_SETLK:
case F_SETLKW: {
zval **element;
struct flock lk = {0};
HashTable *fh;
if (!arg) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be array or int, none given");
RETURN_FALSE;
} }
if (zend_hash_find(fh, "whence", sizeof("whence"), (void **) &element) == FAILURE) {
lk.l_whence = 0;
}
else {
lk.l_whence = Z_LVAL_PP(element);
if (Z_TYPE_P(arg) == IS_ARRAY) {
fh = HASH_OF(arg);
if (zend_hash_find(fh, "start", sizeof("start"), (void **) &element) == FAILURE) {
lk.l_start = 0;
} else {
lk.l_start = Z_LVAL_PP(element);
}
if (zend_hash_find(fh, "length", sizeof("length"), (void **) &element) == FAILURE) {
lk.l_len = 0;
} else {
lk.l_len = Z_LVAL_PP(element);
}
if (zend_hash_find(fh, "whence", sizeof("whence"), (void **) &element) == FAILURE) {
lk.l_whence = 0;
} else {
lk.l_whence = Z_LVAL_PP(element);
}
if (zend_hash_find(fh, "type", sizeof("type"), (void **) &element) == FAILURE) {
lk.l_type = 0;
} else {
lk.l_type = Z_LVAL_PP(element);
}
} else if (Z_TYPE_P(arg) == IS_LONG) {
lk.l_start = 0;
lk.l_len = 0;
lk.l_whence = SEEK_SET;
lk.l_type = Z_LVAL_P(arg);
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be array or int, %s given", zend_zval_type_name(arg));
RETURN_FALSE;
} }
if (zend_hash_find(fh, "type", sizeof("type"), (void **) &element) == FAILURE) {
lk.l_type = 0;
}
else {
lk.l_type = Z_LVAL_PP(element);
}
} else if (Z_TYPE_P(arg) == IS_LONG) {
lk.l_start = 0;
lk.l_len = 0;
lk.l_whence = SEEK_SET;
lk.l_type = Z_LVAL_P(arg);
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be array or int, %s given", zend_zval_type_name(arg));
RETURN_FALSE;
RETURN_LONG(fcntl(f->fd, cmd, &lk));
break;
} }
RETURN_LONG(fcntl(f->fd, cmd, &lk));
break;
}
case F_GETLK: {
struct flock lk = {0};
case F_GETLK: {
struct flock lk = {0};
fcntl(f->fd, cmd, &lk);
fcntl(f->fd, cmd, &lk);
array_init(return_value);
add_assoc_long(return_value, "type", lk.l_type);
add_assoc_long(return_value, "whence", lk.l_whence);
add_assoc_long(return_value, "start", lk.l_start);
add_assoc_long(return_value, "length", lk.l_len);
add_assoc_long(return_value, "pid", lk.l_pid);
break;
}
case F_DUPFD: {
php_fd_t *new_f;
array_init(return_value);
add_assoc_long(return_value, "type", lk.l_type);
add_assoc_long(return_value, "whence", lk.l_whence);
add_assoc_long(return_value, "start", lk.l_start);
add_assoc_long(return_value, "length", lk.l_len);
add_assoc_long(return_value, "pid", lk.l_pid);
if (!arg || Z_TYPE_P(arg) != IS_LONG) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be int");
RETURN_FALSE;
break;
} }
case F_DUPFD: {
php_fd_t *new_f;
new_php_fd(&new_f, fcntl(f->fd, cmd, Z_LVAL_P(arg)));
ZEND_REGISTER_RESOURCE(return_value, new_f, le_fd);
break;
}
default:
if (!arg || Z_TYPE_P(arg) != IS_LONG) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be int");
RETURN_FALSE;
if (!arg || Z_TYPE_P(arg) != IS_LONG) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be int");
RETURN_FALSE;
}
new_php_fd(&new_f, fcntl(f->fd, cmd, Z_LVAL_P(arg)));
ZEND_REGISTER_RESOURCE(return_value, new_f, le_fd);
break;
} }
default:
if (!arg || Z_TYPE_P(arg) != IS_LONG) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be int");
RETURN_FALSE;
}
RETURN_LONG(fcntl(f->fd, cmd, Z_LVAL_P(arg)));
RETURN_LONG(fcntl(f->fd, cmd, Z_LVAL_P(arg)));
} }
} }
/* }}} */ /* }}} */
/* {{{ proto mixed dio_tcsetattr(resource fd, array args ) /* {{{ proto mixed dio_tcsetattr(resource fd, array args )
Perform a c library tcsetattr on fd */ Perform a c library tcsetattr on fd */
PHP_FUNCTION(dio_tcsetattr) PHP_FUNCTION(dio_tcsetattr)
@ -422,8 +419,8 @@ PHP_FUNCTION(dio_tcsetattr)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &r_fd, &arg) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &r_fd, &arg) == FAILURE) {
return; return;
} }
ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
if (Z_TYPE_P(arg) != IS_ARRAY) { if (Z_TYPE_P(arg) != IS_ARRAY) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,"tcsetattr, third argument should be an associative array"); php_error_docref(NULL TSRMLS_CC, E_WARNING,"tcsetattr, third argument should be an associative array");
@ -558,8 +555,8 @@ PHP_FUNCTION(dio_tcsetattr)
newtio.c_iflag = IGNPAR; newtio.c_iflag = IGNPAR;
newtio.c_oflag = 0; newtio.c_oflag = 0;
newtio.c_lflag = 0; /* ICANON; */ newtio.c_lflag = 0; /* ICANON; */
newtio.c_cc[VMIN]=1;
newtio.c_cc[VTIME]=0;
newtio.c_cc[VMIN] = 1;
newtio.c_cc[VTIME] = 0;
tcflush(f->fd, TCIFLUSH); tcflush(f->fd, TCIFLUSH);
tcsetattr(f->fd,TCSANOW,&newtio); tcsetattr(f->fd,TCSANOW,&newtio);
@ -567,8 +564,6 @@ PHP_FUNCTION(dio_tcsetattr)
} }
/* }}} */ /* }}} */
/* {{{ proto void dio_close(resource fd) /* {{{ proto void dio_close(resource fd)
Close the file descriptor given by fd */ Close the file descriptor given by fd */
PHP_FUNCTION(dio_close) PHP_FUNCTION(dio_close)
@ -579,6 +574,7 @@ PHP_FUNCTION(dio_close)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &r_fd) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &r_fd) == FAILURE) {
return; return;
} }
ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
zend_list_delete(Z_LVAL_P(r_fd)); zend_list_delete(Z_LVAL_P(r_fd));

Write Preview
Loading…
Cancel
Save