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

ruby.c: magic numbers

Browse Source 
* ruby.c (ruby_init_loadpath_safe): remove magic numbers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-08-29 05:59:05 +00:00
parent cc4c0ab862
commit 58d0277775
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruby.c
View File

@ -411,9 +411,17 @@ ruby_init_loadpath_safe(int safe_level)
#endif
p = strrchr(libpath, '/');
if (p) {
static const char bindir[] = "/bin";
static const char libdir[] = "/lib";
const ptrdiff_t bindir_len = (ptrdiff_t)sizeof(bindir) - 1;
const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) - 1;
*p = 0;
if (p - libpath > 3 && !(STRCASECMP(p - 4, "/bin") && strcmp(p - 4, "/lib"))) {
p -= 4;
if (p - libpath >= bindir_len && !STRCASECMP(p - bindir_len, bindir)) {
p -= bindir_len;
*p = 0;
}
else if (p - libpath >= libdir_len && !strcmp(p - libdir_len, libdir)) {
p -= libdir_len;
*p = 0;
}
}