svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c branches/PHP_5_3/sapi/fpm/fpm/fpm_sockets.c branches/PHP_5_3/sapi/fpm/fpm/fpm_str.h
trunk/sapi/fpm/fpm/fpm_request.c trunk/sapi/fpm/fpm/fpm_sockets.c trunk/sapi/fpm/fpm/fpm_str.h

fat Sun, 30 Jan 2011 13:51:20 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=307861 Log: - remove cpystrn from FPM and use strlcpy instead. Changed paths: U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_sockets.c U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_str.h U php/php-src/trunk/sapi/fpm/fpm/fpm_request.c U php/php-src/trunk/sapi/fpm/fpm/fpm_sockets.c U php/php-src/trunk/sapi/fpm/fpm/fpm_str.h Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c =================================================================== --- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c 2011-01-30 12:41:26 UTC (rev 307860) +++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c 2011-01-30 13:51:20 UTC (rev 307861) @@ -61,11 +61,11 @@ fpm_clock_get(&slot->tv); if (request_uri) { - cpystrn(slot->request_uri, request_uri, sizeof(slot->request_uri)); + strlcpy(slot->request_uri, request_uri, sizeof(slot->request_uri)); } if (request_method) { - cpystrn(slot->request_method, request_method, sizeof(slot->request_method)); + strlcpy(slot->request_method, request_method, sizeof(slot->request_method)); } slot->content_length = fpm_php_content_length(TSRMLS_C); @@ -73,7 +73,7 @@ /* if cgi.fix_pathinfo is set to "1" and script cannot be found (404) the sapi_globals.request_info.path_translated is set to NULL */ if (script_filename) { - cpystrn(slot->script_filename, script_filename, sizeof(slot->script_filename)); + strlcpy(slot->script_filename, script_filename, sizeof(slot->script_filename)); } fpm_shm_slots_release(slot); Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_sockets.c =================================================================== --- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_sockets.c 2011-01-30 12:41:26 UTC (rev 307860) +++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_sockets.c 2011-01-30 13:51:20 UTC (rev 307861) @@ -286,7 +286,7 @@ struct sockaddr_un sa_un; memset(&sa_un, 0, sizeof(sa_un)); - cpystrn(sa_un.sun_path, wp->config->listen_address, sizeof(sa_un.sun_path)); + strlcpy(sa_un.sun_path, wp->config->listen_address, sizeof(sa_un.sun_path)); sa_un.sun_family = AF_UNIX; return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_un, sizeof(struct sockaddr_un)); } Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_str.h =================================================================== --- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_str.h 2011-01-30 12:41:26 UTC (rev 307860) +++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_str.h 2011-01-30 13:51:20 UTC (rev 307861) @@ -5,29 +5,6 @@ #ifndef FPM_STR_H #define FPM_STR_H 1 -static inline char *cpystrn(char *dst, const char *src, size_t dst_size) /* {{{ */ -{ - char *d, *end; - - if (!dst_size) { - return dst; - } - - d = dst; - end = dst + dst_size - 1; - - for (; d < end; ++d, ++src) { - if (!(*d = *src)) { - return d; - } - } - - *d = '\0'; - - return d; -} -/* }}} */ - static inline char *str_purify_filename(char *dst, char *src, size_t size) /* {{{ */ { char *d, *end; Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_request.c =================================================================== --- php/php-src/trunk/sapi/fpm/fpm/fpm_request.c 2011-01-30 12:41:26 UTC (rev 307860) +++ php/php-src/trunk/sapi/fpm/fpm/fpm_request.c 2011-01-30 13:51:20 UTC (rev 307861) @@ -61,11 +61,11 @@ fpm_clock_get(&slot->tv); if (request_uri) { - cpystrn(slot->request_uri, request_uri, sizeof(slot->request_uri)); + strlcpy(slot->request_uri, request_uri, sizeof(slot->request_uri)); } if (request_method) { - cpystrn(slot->request_method, request_method, sizeof(slot->request_method)); + strlcpy(slot->request_method, request_method, sizeof(slot->request_method)); } slot->content_length = fpm_php_content_length(TSRMLS_C); @@ -73,7 +73,7 @@ /* if cgi.fix_pathinfo is set to "1" and script cannot be found (404) the sapi_globals.request_info.path_translated is set to NULL */ if (script_filename) { - cpystrn(slot->script_filename, script_filename, sizeof(slot->script_filename)); + strlcpy(slot->script_filename, script_filename, sizeof(slot->script_filename)); } fpm_shm_slots_release(slot); Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_sockets.c =================================================================== --- php/php-src/trunk/sapi/fpm/fpm/fpm_sockets.c 2011-01-30 12:41:26 UTC (rev 307860) +++ php/php-src/trunk/sapi/fpm/fpm/fpm_sockets.c 2011-01-30 13:51:20 UTC (rev 307861) @@ -286,7 +286,7 @@ struct sockaddr_un sa_un; memset(&sa_un, 0, sizeof(sa_un)); - cpystrn(sa_un.sun_path, wp->config->listen_address, sizeof(sa_un.sun_path)); + strlcpy(sa_un.sun_path, wp->config->listen_address, sizeof(sa_un.sun_path)); sa_un.sun_family = AF_UNIX; return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_un, sizeof(struct sockaddr_un)); } Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_str.h =================================================================== --- php/php-src/trunk/sapi/fpm/fpm/fpm_str.h 2011-01-30 12:41:26 UTC (rev 307860) +++ php/php-src/trunk/sapi/fpm/fpm/fpm_str.h 2011-01-30 13:51:20 UTC (rev 307861) @@ -5,29 +5,6 @@ #ifndef FPM_STR_H #define FPM_STR_H 1 -static inline char *cpystrn(char *dst, const char *src, size_t dst_size) /* {{{ */ -{ - char *d, *end; - - if (!dst_size) { - return dst; - } - - d = dst; - end = dst + dst_size - 1; - - for (; d < end; ++d, ++src) { - if (!(*d = *src)) { - return d; - } - } - - *d = '\0'; - - return d; -} -/* }}} */ - static inline char *str_purify_filename(char *dst, char *src, size_t size) /* {{{ */ { char *d, *end;