mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-27 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

file.c: skiproot doesn't need encoding

Browse Source
This commit is contained in:
Jean Boussier 2026-01-19 08:52:57 +01:00
parent 11d29d32d2
commit 240a58ecc6
Notes: git 2026-01-20 07:34:24 +00:00 
Merged: https://github.com/ruby/ruby/pull/15907
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
file.c
View File

@ -3636,7 +3636,7 @@ not_same_drive(VALUE path, int drive)
#endif /* DOSISH_DRIVE_LETTER */
static inline char *
skiproot(const char *path, const char *end, rb_encoding *enc)
skiproot(const char *path, const char *end)
{
#ifdef DOSISH_DRIVE_LETTER
if (path + 2 <= end && has_drive_letter(path)) path += 2;
@ -3689,7 +3689,7 @@ skipprefixroot(const char *path, const char *end, rb_encoding *enc)
while (isdirsep(*p)) p++;
return p;
#else
return skiproot(path, end, enc);
return skiproot(path, end);
#endif
}
@ -4075,7 +4075,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
rb_enc_associate(result, enc = fs_enc_check(result, fname));
p = pend;
}
p = chompdirsep(skiproot(buf, p, enc), p, enc);
p = chompdirsep(skiproot(buf, p), p, enc);
s += 2;
}
}
@ -4100,7 +4100,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
}
else
#endif /* defined DOSISH || defined __CYGWIN__ */
p = chompdirsep(skiproot(buf, p, enc), p, enc);
p = chompdirsep(skiproot(buf, p), p, enc);
}
else {
size_t len;
@ -4231,7 +4231,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
BUFCOPY(b, s-b);
rb_str_set_len(result, p-buf);
}
if (p == skiproot(buf, p + !!*p, enc) - 1) p++;
if (p == skiproot(buf, p + !!*p) - 1) p++;
#if USE_NTFS
*p = '\0';
@ -5081,7 +5081,7 @@ rb_file_dirname_n(VALUE fname, int n)
CheckPath(fname, name);
end = name + RSTRING_LEN(fname);
enc = path_enc_get(fname);
root = skiproot(name, end, enc);
root = skiproot(name, end);
#ifdef DOSISH_UNC
if (root > name + 1 && isdirsep(*name))
root = skipprefix(name = root - 2, end, enc);
@ -5133,7 +5133,7 @@ rb_file_dirname_n(VALUE fname, int n)
}
#ifdef DOSISH_DRIVE_LETTER
if (has_drive_letter(name) && isdirsep(*(name + 2))) {
const char *top = skiproot(name + 2, end, enc);
const char *top = skiproot(name + 2, end);
dirname = rb_enc_str_new(name, 3, rb_str_enc_get(fname));
rb_str_cat(dirname, top, p - top);
}