diff options
| -rw-r--r-- | dir.c | 2 | ||||
| -rw-r--r-- | file.c | 8 | ||||
| -rw-r--r-- | include/ruby/util.h | 1 | ||||
| -rw-r--r-- | process.c | 2 |
4 files changed, 6 insertions, 7 deletions
@@ -1127,7 +1127,7 @@ rb_dir_getwd_ospath(void) #undef RUBY_UNTYPED_DATA_WARNING #define RUBY_UNTYPED_DATA_WARNING 0 path_guard = Data_Wrap_Struct((VALUE)0, NULL, RUBY_DEFAULT_FREE, NULL); - path = my_getcwd(); + path = ruby_getcwd(); DATA_PTR(path_guard) = path; #ifdef __APPLE__ cwd = rb_str_normalize_ospath(path, strlen(path)); @@ -3130,9 +3130,9 @@ getcwdofdrv(int drv) of a particular drive is to change chdir() to that drive, so save the old cwd before chdir() */ - oldcwd = my_getcwd(); + oldcwd = ruby_getcwd(); if (chdir(drive) == 0) { - drvcwd = my_getcwd(); + drvcwd = ruby_getcwd(); chdir(oldcwd); xfree(oldcwd); } @@ -3553,7 +3553,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na p = pend; } else { - char *e = append_fspath(result, fname, my_getcwd(), &enc, fsenc); + char *e = append_fspath(result, fname, ruby_getcwd(), &enc, fsenc); tainted = 1; BUFINIT(); p = e; @@ -5842,7 +5842,7 @@ path_check_0(VALUE path, int execpath) char *p = 0, *s; if (!rb_is_absolute_path(p0)) { - char *buf = my_getcwd(); + char *buf = ruby_getcwd(); VALUE newpath; newpath = rb_str_new2(buf); diff --git a/include/ruby/util.h b/include/ruby/util.h index 3b78e467b4..3fecba8ebc 100644 --- a/include/ruby/util.h +++ b/include/ruby/util.h @@ -70,7 +70,6 @@ char *ruby_strdup(const char *); #define strdup(s) ruby_strdup(s) char *ruby_getcwd(void); -#define my_getcwd() ruby_getcwd() double ruby_strtod(const char *, char **); #undef strtod @@ -3081,7 +3081,7 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp, if (eargp->chdir_given) { if (sargp) { - char *cwd = my_getcwd(); + char *cwd = ruby_getcwd(); sargp->chdir_given = 1; sargp->chdir_dir = hide_obj(rb_str_new2(cwd)); xfree(cwd); |