Skip to content

[Flang][runtime] Fix RENAME intrinsic, remove trailing blanks #159123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjklemm merged 8 commits into from
Sep 17, 2025
Merged

[Flang][runtime] Fix RENAME intrinsic, remove trailing blanks #159123

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
664be1d
[Flang][runtime] Fix RENAME intrinsic, remove trailing blanks
mjklemm Sep 16, 2025
b20d0ab
Update flang-rt/lib/runtime/misc-intrinsic.cpp
mjklemm Sep 16, 2025
6827079
Introduce function IsNullTerminated
mjklemm Sep 17, 2025
8b60514
Add proper handling of null-terminated character strings
mjklemm Sep 17, 2025
8e9305e
Remove sizeof
mjklemm Sep 17, 2025
58cbad6
Revert "Introduce function IsNullTerminated"
mjklemm Sep 17, 2025
b5101da
Simplify code
mjklemm Sep 17, 2025
14cbc44
Cleanup
mjklemm Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion flang-rt/lib/runtime/misc-intrinsic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,20 @@ void RTDEF(Rename)(const Descriptor &path1, const Descriptor &path2,
char *pathDst{EnsureNullTerminated(
path2.OffsetElement(), path2.ElementBytes(), terminator)};

// Trim trailing blanks
Copy link
Contributor

@kparzysz kparzysz Sep 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

File names in most unix-like filesystems can have trailing spaces. I think it's the caller that should make sure the names are correct.

Copy link
Contributor Author

@mjklemm mjklemm Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do agree with that sentiment, but this implements the semantics of GFortran with this PR: https://gcc.gnu.org/onlinedocs/gfortran/RENAME.html.

Copy link
Contributor

@jeanPerier jeanPerier Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kparzysz, note that you can still deal with blank terminated files on UNIX system after this patch by using rename("test_trailing "//char(0), "new_name "//char(0)).

This is consistent not only with gfortran, but also with IFX and nvfortran/classic flang implementations. Given this is a legacy lib3f intrinsic, we must stick to the existing behaviors here.

auto srcTrimPos{TrimTrailingSpaces(pathSrc, path1.ElementBytes())};
auto dstTrimPos{TrimTrailingSpaces(pathDst, path2.ElementBytes())};
char *srcPathTrim{
static_cast<char *>(alloca((srcTrimPos + 1) * sizeof(char)))};
char *dstPathTrim{
static_cast<char *>(alloca((dstTrimPos + 1) * sizeof(char)))};
std::memcpy(srcPathTrim, pathSrc, srcTrimPos);
std::memcpy(dstPathTrim, pathDst, dstTrimPos);
srcPathTrim[srcTrimPos] = '\0';
dstPathTrim[dstTrimPos] = '\0';

// We simply call rename(2) from POSIX
int result{rename(pathSrc, pathDst)};
int result{rename(srcPathTrim, dstPathTrim)};
if (status) {
// When an error has happened,
int errorCode{0}; // Assume success
Expand Down
Loading