Skip to content

Commit 6d0da24

Browse files
committed
Remove use of NAME_MAX as some file systems may break it.
1 parent 15900e9 commit 6d0da24

File tree

5 files changed

+1
-10
lines changed

5 files changed

+1
-10
lines changed

src/main/java/org/truffleruby/platform/DarwinAMD64NativeConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,6 @@ public static void load(NativeConfiguration configuration, RubyContext context)
369369
configuration.config("platform.file.DT_SOCK", 12);
370370
configuration.config("platform.file.DT_UNKNOWN", 0);
371371
configuration.config("platform.file.AT_SYMLINK_NOFOLLOW", 32);
372-
configuration.config("platform.file.NAME_MAX", 255);
373372
configuration.config("platform.io.SEEK_SET", 0);
374373
configuration.config("platform.io.SEEK_CUR", 1);
375374
configuration.config("platform.io.SEEK_END", 2);

src/main/java/org/truffleruby/platform/LinuxAMD64NativeConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@ public static void load(NativeConfiguration configuration, RubyContext context)
394394
configuration.config("platform.file.DT_SOCK", 12);
395395
configuration.config("platform.file.DT_UNKNOWN", 0);
396396
configuration.config("platform.file.AT_SYMLINK_NOFOLLOW", 256);
397-
configuration.config("platform.file.NAME_MAX", 255);
398397
configuration.config("platform.io.SEEK_SET", 0);
399398
configuration.config("platform.io.SEEK_CUR", 1);
400399
configuration.config("platform.io.SEEK_END", 2);

src/main/java/org/truffleruby/platform/LinuxARM64NativeConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,6 @@ public static void load(NativeConfiguration configuration, RubyContext context)
395395
configuration.config("platform.file.DT_SOCK", 12);
396396
configuration.config("platform.file.DT_UNKNOWN", 0);
397397
configuration.config("platform.file.AT_SYMLINK_NOFOLLOW", 256);
398-
configuration.config("platform.file.NAME_MAX", 255);
399398
configuration.config("platform.io.SEEK_SET", 0);
400399
configuration.config("platform.io.SEEK_CUR", 1);
401400
configuration.config("platform.io.SEEK_END", 2);

src/main/ruby/truffleruby/core/truffle/dir_operations.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@ module DirOperations
2020
DT_DIR = Truffle::Config['platform.file.DT_DIR']
2121
DT_UNKNOWN = Truffle::Config['platform.file.DT_UNKNOWN']
2222

23-
NAME_MAX = Truffle::Config['platform.file.NAME_MAX']
24-
25-
2623
def self.readdir(dir)
2724
dir.__send__(:ensure_open)
2825
dirptr = dir.instance_variable_get(:@ptr)
2926
dirent = Truffle::POSIX.truffleposix_readdir(dirptr)
3027
if !dirent.null?
31-
str = fix_entry_encoding(dir, dirent.get_string(DIRENT_NAME_OFFSET, NAME_MAX))
28+
str = fix_entry_encoding(dir, dirent.get_string(DIRENT_NAME_OFFSET))
3229
type = (dirent + DIRENT_TYPE_OFFSET).read_uchar
3330
[str, type]
3431
else

tool/generate-native-config.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@ def constants(name)
590590
cg.include 'fnmatch.h'
591591
cg.include 'sys/stat.h'
592592
cg.include 'dirent.h'
593-
cg.include 'limits.h'
594593
cg.consts %w[
595594
FNM_CASEFOLD FNM_DOTMATCH FNM_EXTGLOB FNM_NOESCAPE FNM_PATHNAME FNM_SYSCASE
596595

@@ -606,8 +605,6 @@ def constants(name)
606605
DT_BLK DT_CHR DT_DIR DT_FIFO DT_LNK DT_REG DT_SOCK DT_UNKNOWN
607606

608607
AT_SYMLINK_NOFOLLOW
609-
610-
NAME_MAX
611608
]
612609
end
613610

0 commit comments

Comments
 (0)