summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2000-03-16 22:46:53 +0000
committerAndi Gutmans <andi@php.net>2000-03-16 22:46:53 +0000
commitcd83fb18c0e957a6ddc30053452f40bd7ac3f333 (patch)
tree0f4a02a974a725d9c63caaf7b2a98f02bfc96810
parentb46c44b485562e96aa78d7f1e1ce7bf49f1bba10 (diff)
downloadphp-git-cd83fb18c0e957a6ddc30053452f40bd7ac3f333.tar.gz
- Last one for today.
-rw-r--r--main/php_virtual_cwd.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/main/php_virtual_cwd.c b/main/php_virtual_cwd.c
index 58855fa10f..a8c04b0390 100644
--- a/main/php_virtual_cwd.c
+++ b/main/php_virtual_cwd.c
@@ -137,7 +137,7 @@ char *virtual_getcwd(cwd_state *state, uint *length)
}
/* returns 0 for ok, 1 for error */
-int virtual_chdir(cwd_state *state, char *path, verify_path_func verify_path)
+int virtual_file_ex(cwd_state *state, char *path, verify_path_func verify_path)
{
uint path_length = strlen(path);
char *ptr = path;
@@ -220,6 +220,16 @@ int virtual_chdir(cwd_state *state, char *path, verify_path_func verify_path)
return (ret);
}
+int virtual_chdir(cwd_state *state, char *path)
+{
+ return virtual_file_ex(state, path, NULL); /* Use NULL right now instead of php_is_dir_ok */
+}
+
+int virtual_filepath(cwd_state *state, char *path)
+{
+ return virtual_file_ex(state, path, php_is_file_ok);
+}
+
main(void)
{
cwd_state state;
@@ -240,7 +250,7 @@ main(void)
#define T(a) \
printf("[%s] $ cd %s\n", virtual_getcwd(&state, &length), a); \
- virtual_chdir(&state, strdup(a), NULL); \
+ virtual_chdir(&state, strdup(a)); \
printf("new path is %s\n", virtual_getcwd(&state, &length));
T("..")