remove unused file

diff --git a/ext/phar/php_stream_unlink.h b/ext/phar/php_stream_unlink.h
deleted file mode 100644 (file)
index 31a126e..0000000
--- a/ext/phar/php_stream_unlink.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef PHAR_UNLINK
-#define PHAR_UNLINK
-#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID < 50400 || PHP_VERSION_ID >= 60000)
-
-static int _php_stream_unlink(char *url, int options, php_stream_context *context TSRMLS_DC)
-{
-       php_stream_wrapper *wrapper = php_stream_locate_url_wrapper(url, NULL, options TSRMLS_CC);
-
-       if (!wrapper || !wrapper->wops) {
-               return 0;
-       }
-
-       if (!wrapper->wops->unlink) {
-               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "%s does not allow unlinking", wrapper->wops->label ? wrapper->wops->label : "Wrapper");
-               return 0;
-       }
-       return wrapper->wops->unlink(wrapper, url, ENFORCE_SAFE_MODE | REPORT_ERRORS, context TSRMLS_CC);
-}
-
-#define php_stream_unlink(url, options, context) _php_stream_unlink((url), (options), (context) TSRMLS_CC)
-
-#endif /* defined(PHP_VERSION_ID) && (PHP_VERSION_ID < 50400 || PHP_VERSION_ID >= 60000) */
-#endif /* PHAR_UNLINK */

diff --git a/ext/phar/stream.c b/ext/phar/stream.c
index 50a7968ebaa224e20bc9dd0545e8a9328b5e4360..a5fb04433c01f19c9364fa8503458a0136562ef1 100644 (file)
--- a/ext/phar/stream.c
+++ b/ext/phar/stream.c
@@ -19,7 +19,6 @@
 
 #define PHAR_STREAM 1
 #include "phar_internal.h"
-#include "php_stream_unlink.h"
 #include "stream.h"
 #include "dirstream.h"
 
@@ -743,11 +742,13 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char
        error = NULL;
 
        if ((resource_from = phar_open_url(wrapper, url_from, "r+b", options TSRMLS_CC)) == NULL) {
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot rename \"%s\" to \"%s\": invalid url \"%s\"", url_from, url_to, url_from);
                return 0;
        }
        
        if ((resource_to = phar_open_url(wrapper, url_to, "wb", options TSRMLS_CC)) == NULL) {
                php_url_free(resource_from);
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot rename \"%s\" to \"%s\": invalid url \"%s\"", url_from, url_to, url_to);
                return 0;
        }
 
@@ -766,28 +767,28 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char
        if (!resource_from->scheme || !resource_from->host || !resource_from->path) {
                php_url_free(resource_from);
                php_url_free(resource_to);
-               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: invalid url \"%s\"", url_from);
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot rename \"%s\" to \"%s\": invalid url \"%s\"", url_from, url_to, url_from);
                return 0;
        }
        
        if (!resource_to->scheme || !resource_to->host || !resource_to->path) {
                php_url_free(resource_from);
                php_url_free(resource_to);
-               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: invalid url \"%s\"", url_to);
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot rename \"%s\" to \"%s\": invalid url \"%s\"", url_from, url_to, url_to);
                return 0;
        }
 
        if (strcasecmp("phar", resource_from->scheme)) {
                php_url_free(resource_from);
                php_url_free(resource_to);
-               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: not a phar stream url \"%s\"", url_from);
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot rename \"%s\" to \"%s\": not a phar stream url \"%s\"", url_from, url_to, url_from);
                return 0;
        }
 
        if (strcasecmp("phar", resource_to->scheme)) {
                php_url_free(resource_from);
                php_url_free(resource_to);
-               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: not a phar stream url \"%s\"", url_to);
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot rename \"%s\" to \"%s\": not a phar stream url \"%s\"", url_from, url_to, url_to);
                return 0;
        }