cvs: php-src /ext/standard ftp_fopen_wrapper.c

pollita Wed Jan 28 17:50:14 2004 EDT Modified files: /php-src/ext/standard ftp_fopen_wrapper.c Log: FTP dirstream_read should not leave whitespace/newlines on dirents http://cvs.php.net/diff.php/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.72&r2=1.73&ty=u Index: php-src/ext/standard/ftp_fopen_wrapper.c diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.72 php-src/ext/standard/ftp_fopen_wrapper.c:1.73 --- php-src/ext/standard/ftp_fopen_wrapper.c:1.72 Sat Jan 24 19:30:50 2004 +++ php-src/ext/standard/ftp_fopen_wrapper.c Wed Jan 28 17:50:12 2004 @@ -18,7 +18,7 @@ | Sara Golemon <pollita@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: ftp_fopen_wrapper.c,v 1.72 2004/01/25 00:30:50 abies Exp $ */ +/* $Id: ftp_fopen_wrapper.c,v 1.73 2004/01/28 22:50:12 pollita Exp $ */ #include "php.h" #include "php_globals.h" @@ -586,11 +586,19 @@ return 0; } - tmp_len = MIN(sizeof(ent->d_name), basename_len) - 1; + tmp_len = MIN(sizeof(ent->d_name), basename_len - 1); memcpy(ent->d_name, basename, tmp_len); ent->d_name[tmp_len] = '\0'; efree(basename); + /* Trim off trailing whitespace characters */ + tmp_len--; + while (tmp_len >= 0 && + (ent->d_name[tmp_len] == '\n' || ent->d_name[tmp_len] == '\r' || + ent->d_name[tmp_len] == '\t' || ent->d_name[tmp_len] == ' ')) { + ent->d_name[tmp_len--] = '\0'; + } + return sizeof(php_stream_dirent); } /* }}} */