admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6463 from dearblue/dirname

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-01-02 21:58:01 +09:00
committed by GitHub
parent 1c50d1885d 5c91014530
commit e35c027966
2 changed files with 120 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-io/src/file.c
+60 -28
View File
@@ -51,8 +51,10 @@
#define PATH_SEPARATOR ";"
#define FILE_ALT_SEPARATOR "\\"
#define VOLUME_SEPARATOR ":"
#define DIRSEP_P(ch) (((ch) == '/') | ((ch) == '\\'))
#else
#define PATH_SEPARATOR ":"
#define DIRSEP_P(ch) ((ch) == '/')
#endif
#ifndef LOCK_SH
@@ -163,42 +165,72 @@ mrb_file_s_rename(mrb_state *mrb, mrb_value obj)
return mrb_fixnum_value(0);
}
#define SKIP_DIRSEP(p) for (; DIRSEP_P(*(p)); (p)++)
#define NEXT_DIRSEP(p) for (; *(p) != '\0' && !DIRSEP_P(*(p)); (p)++)
static const char*
scan_dirname(const char *path, mrb_int level)
{
const char *p = path + strlen(path);
if (level < 1) return p;
for (; p > path && DIRSEP_P(p[-1]); p--)
;
for (; level > 0; level--) {
for (; p > path && !DIRSEP_P(p[-1]); p--)
;
for (; p > path && DIRSEP_P(p[-1]); p--)
;
}
return p > path ? p : path;
}
static mrb_value
mrb_file_dirname(mrb_state *mrb, mrb_value klass)
{
#if defined(_WIN32)
char dname[_MAX_DIR], vname[_MAX_DRIVE];
char buffer[_MAX_DRIVE + _MAX_DIR];
const char *utf8_path;
mrb_get_args(mrb, "z", &utf8_path);
char *path = mrb_locale_from_utf8(utf8_path, -1);
_splitpath(path, vname, dname, NULL, NULL);
snprintf(buffer, _MAX_DRIVE + _MAX_DIR, "%s%s", vname, dname);
mrb_locale_free(path);
size_t ridx = strlen(buffer);
if (ridx == 0) {
strncpy(buffer, ".", 2); /* null terminated */
const char *path;
mrb_int level = 1;
mrb_get_args(mrb, "z|i", &path, &level);
if (level < 0) {
mrb_raisef(mrb, E_ARGUMENT_ERROR, "negative level: %i", level);
}
else if (ridx > 1) {
ridx--;
while (ridx > 0 && (buffer[ridx] == '/' || buffer[ridx] == '\\')) {
buffer[ridx] = '\0'; /* remove last char */
ridx--;
const char *p = path;
#ifdef _WIN32
if (DIRSEP_P(p[0]) && DIRSEP_P(p[1])) {
p += 2;
SKIP_DIRSEP(p);
path = p - 2; /* if consecutive, point to the trailing slash */
NEXT_DIRSEP(p);
const char *o = p;
SKIP_DIRSEP(p);
if (*p == '\0') {
p = o;
}
else {
NEXT_DIRSEP(p);
p = scan_dirname(p, level);
}
return mrb_str_new(mrb, path, p - path);
}
return mrb_str_new_cstr(mrb, buffer);
#else
mrb_value s;
mrb_get_args(mrb, "S", &s);
char *path = mrb_locale_from_utf8(mrb_str_to_cstr(mrb, s), -1);
char *dname;
if ((dname = dirname(path)) == NULL) {
mrb_locale_free(path);
mrb_sys_fail(mrb, "dirname");
else if (ISALPHA(p[0]) && p[1] == ':') {
p += 2;
const char *o = p;
SKIP_DIRSEP(p);
p = scan_dirname(p, level);
mrb_value s = mrb_str_new(mrb, path, p - path);
if (p == o) {
mrb_str_cat_lit(mrb, s, ".");
}
return s;
}
mrb_locale_free(path);
return mrb_str_new_cstr(mrb, dname);
#endif
SKIP_DIRSEP(p);
if (p > path) {
path = p - 1; /* if consecutive, point to the trailing slash */
}
p = scan_dirname(p, level);
return (p == path) ? mrb_str_new_lit(mrb, ".") : mrb_str_new(mrb, path, p - path);
}
static mrb_value
mrbgems/mruby-io/test/file.rb
+60
View File
@@ -3,6 +3,15 @@
MRubyIOTestUtil.io_test_setup
def assert_dirname_with_level(path, results)
assert('dirname with level') do
assert_raise(ArgumentError) { File.dirname path, -1 }
results.each do |level, expect|
assert_equal expect, File.dirname(path, level)
end
end
end
assert('File.class', '15.2.21') do
assert_equal Class, File.class
end
@@ -40,8 +49,59 @@ assert('File.dirname') do
assert_equal '.', File.dirname('')
assert_equal '.', File.dirname('a')
assert_equal '/', File.dirname('/a')
assert_equal '/', File.dirname('/a/')
assert_equal 'a', File.dirname('a/b')
assert_equal 'a', File.dirname('a/b/')
assert_equal 'a/b', File.dirname('a/b/c')
assert_equal '/a', File.dirname('/a/b')
assert_equal '/a', File.dirname('/a/b/')
assert_equal '/a/b', File.dirname('/a/b/c')
assert_equal '/a/b', File.dirname('/a/b/c/')
assert_equal '/', File.dirname('/a//')
assert_equal '/a', File.dirname('/a//b')
assert_equal '/a/b', File.dirname('/a/b//c//')
end
assert('File.dirname (with level)') do
assert_dirname_with_level '', { 0 => '.', 1 => '.', 2 => '.' }
assert_dirname_with_level 'a', { 0 => 'a', 1 => '.', 2 => '.' }
assert_dirname_with_level '/a', { 0 => '/a', 1 => '/', 2 => '/' }
assert_dirname_with_level '/a/', { 0 => '/a/', 1 => '/', 2 => '/' }
assert_dirname_with_level 'a/b', { 0 => 'a/b', 1 => 'a', 2 => '.' }
assert_dirname_with_level 'a/b/', { 0 => 'a/b/', 1 => 'a', 2 => '.' }
assert_dirname_with_level 'a/b/c', { 0 => 'a/b/c', 1 => 'a/b', 2 => 'a' }
assert_dirname_with_level 'a/b/c/d', { 0 => 'a/b/c/d', 1 => 'a/b/c', 2 => 'a/b' }
end
unless MRubyIOTestUtil.win?
assert('File.dirname (not Windows)') do
assert_equal '/a', File.dirname('//a//b/')
end
else
assert('File.dirname (on Windows)') do
assert_equal 'c:.', File.dirname('c:')
assert_equal 'c:.', File.dirname('c:a')
assert_equal 'c:.', File.dirname('c:a/')
assert_equal 'c:a', File.dirname('c:a/b')
assert_equal 'c:/', File.dirname('c:/')
assert_equal 'c:/', File.dirname('c:/a')
assert_equal 'c:/', File.dirname('c:/a/')
assert_equal 'c:/a', File.dirname('c:/a/b')
assert_equal '//.', File.dirname('//.')
assert_equal '//.', File.dirname('//./')
assert_equal '//./a', File.dirname('//./a')
assert_equal '//./a', File.dirname('//./a/')
assert_equal '//./a', File.dirname('//./a/b')
assert_equal '//./a/b', File.dirname('//./a/b/c')
assert_equal '//?', File.dirname('//?/')
assert_equal '//?/a', File.dirname('//?/a')
assert_equal '//?/a', File.dirname('//?/a/')
assert_equal '//?/a', File.dirname('//?/a/b')
assert_equal '//host1', File.dirname('//host1/')
assert_equal '//host1/a', File.dirname('//host1/a')
assert_equal '//host1/a', File.dirname('//host1/a/')
assert_equal '//host1/a', File.dirname('//host1/a/b')
end
end
assert('File.extname') do