merge revision(s) 7a05dbc47831a655a1ef8a1635f88292acd325da: [Backport #21561]

Message not found for revision: 7a05dbc47831a655a1ef8a1635f88292acd325da
This commit is contained in:
nagachika 2025-10-05 09:16:20 +09:00
parent 01b0beb818
commit 1811211d6d
2 changed files with 6 additions and 3 deletions

7
file.c
View File

@ -4837,8 +4837,11 @@ rb_file_dirname_n(VALUE fname, int n)
break;
}
}
if (p == name)
return rb_usascii_str_new2(".");
if (p == name) {
dirname = rb_str_new(".", 1);
rb_enc_copy(dirname, fname);
return dirname;
}
#ifdef DOSISH_DRIVE_LETTER
if (has_drive_letter(name) && isdirsep(*(name + 2))) {
const char *top = skiproot(name + 2, end, enc);

View File

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 9
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 173
#define RUBY_PATCHLEVEL 174
#include "ruby/version.h"
#include "ruby/internal/abi.h"