1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

internal.h: move rb_readlink declaration

Browse Source 
* internal.h (rb_readlink): move the declaration.

* ruby.c (dladdr_path): rb_readlink now requires the result
  encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-09-05 14:00:15 +00:00
parent 1587b32480
commit 9af0cf1cfb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file.c
View File

@ -2786,8 +2786,6 @@ rb_file_s_symlink(VALUE klass, VALUE from, VALUE to)
#endif #endif
#ifdef HAVE_READLINK #ifdef HAVE_READLINK
VALUE rb_readlink(VALUE path, rb_encoding *enc);
/* /*
* call-seq: * call-seq:
* File.readlink(link_name) -> file_name * File.readlink(link_name) -> file_name

3
internal.h
View File

@ -1266,6 +1266,9 @@ VALUE rb_str2big_gmp(VALUE arg, int base, int badcheck);
int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data); int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data);
/* file.c (export) */ /* file.c (export) */
#ifdef HAVE_READLINK
VALUE rb_readlink(VALUE path, rb_encoding *enc);
#endif
#ifdef __APPLE__ #ifdef __APPLE__
VALUE rb_str_normalize_ospath(const char *ptr, long len); VALUE rb_str_normalize_ospath(const char *ptr, long len);
#endif #endif

3
ruby.c
View File

@ -382,9 +382,8 @@ dladdr_path(const void* addr)
} }
#ifdef __linux__ #ifdef __linux__
else if (dli.dli_fname == origarg.argv[0]) { else if (dli.dli_fname == origarg.argv[0]) {
VALUE rb_readlink(VALUE);
fname = rb_str_new_cstr("/proc/self/exe"); fname = rb_str_new_cstr("/proc/self/exe");
path = rb_readlink(fname); path = rb_readlink(fname, NULL);
} }
#endif #endif
else { else {