]> granicus.if.org Git - php/commitdiff
Less magic please
authorWez Furlong <wez@php.net>
Sun, 7 Mar 2004 21:36:55 +0000 (21:36 +0000)
committerWez Furlong <wez@php.net>
Sun, 7 Mar 2004 21:36:55 +0000 (21:36 +0000)
main/streams/streams.c

index 79f56f0cc4b6de5d92713fe7f36b6c10438e45f4..29049a4bde0cd24ab977931773296db3bc1462a0 100755 (executable)
@@ -1881,7 +1881,10 @@ PHPAPI int _php_stream_scandir(char *dirname, php_stream_dirent **namelist[], in
                        vector = (php_stream_dirent **) erealloc(vector, vector_size * sizeof(php_stream_dirent *));
                }
 
-               vector[nfiles++] = (php_stream_dirent*)estrndup((const char *)&sdp, sizeof(php_stream_dirent) + ((strlen(sdp.d_name) + 1) * sizeof(char)));
+               vector[nfiles] = emalloc(sizeof(php_stream_dirent));
+               memcpy(vector[nfiles], &sdp, sizeof(sdp));
+
+               nfiles++;
        }
        php_stream_closedir(stream);