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

* file.c (file_expand_path): constified.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-04-20 06:19:28 +00:00
parent d92efa3c0b
commit 5e433ffc6c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
file.c
View File

@ -2560,7 +2560,8 @@ static int is_absolute_path(const char*);
static VALUE static VALUE
file_expand_path(VALUE fname, VALUE dname, VALUE result) file_expand_path(VALUE fname, VALUE dname, VALUE result)
{ {
char *s, *buf, *b, *p, *pend, *root; const char *s, *b;
char *buf, *p, *pend, *root;
long buflen, dirlen; long buflen, dirlen;
int tainted; int tainted;
rb_encoding *extenc = 0; rb_encoding *extenc = 0;
@ -2706,12 +2707,13 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
case '.': case '.':
if (*(s+1) == '\0' || isdirsep(*(s+1))) { if (*(s+1) == '\0' || isdirsep(*(s+1))) {
/* We must go back to the parent */ /* We must go back to the parent */
char *n;
*p = '\0'; *p = '\0';
if (!(b = strrdirsep(root))) { if (!(n = strrdirsep(root))) {
*p = '/'; *p = '/';
} }
else { else {
p = b; p = n;
} }
b = ++s; b = ++s;
} }