From fcfdb14511b80144d1d78a53e9b69483fb99a36a Mon Sep 17 00:00:00 2001 From: "Alfred M. Szmidt" Date: Sat, 4 Aug 2007 21:50:01 +0000 Subject: [PATCH] natFilePosix.cc (init_native): Define to 0. 2007-08-04 Alfred M. Szmidt * java/io/natFilePosix.cc (init_native) [!MAXPATHLEN]: Define to 0. * java/io/File.java (createTempFile): Don't truncate if the system doesn't have a limit on the length of a file name. * classpath/lib/java/io/File.class: Regenerate. From-SVN: r127216 --- libjava/ChangeLog | 7 +++++++ libjava/classpath/lib/java/io/File.class | Bin 14356 -> 14362 bytes libjava/java/io/File.java | 5 ++++- libjava/java/io/natFilePosix.cc | 6 ++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e28062ddb66..e9dbb5fb3bb 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2007-08-04 Alfred M. Szmidt + + * java/io/natFilePosix.cc (init_native) [!MAXPATHLEN]: Define to 0. + * java/io/File.java (createTempFile): Don't truncate if the system + doesn't have a limit on the length of a file name. + * classpath/lib/java/io/File.class: Regenerate. + 2007-08-04 Matthias Klose Import GNU Classpath (libgcj-import-20070727). diff --git a/libjava/classpath/lib/java/io/File.class b/libjava/classpath/lib/java/io/File.class index 746da883bc8db70d78312a49fef61eb438755fb3..8bcfe7989f94649eda480d434cf60f140bd16685 100644 GIT binary patch delta 1561 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 diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index 67d1b96df6c..0c4fb6932f5 100644 --- a/libjava/java/io/File.java +++ b/libjava/java/io/File.java @@ -117,6 +117,7 @@ public class File implements Serializable, Comparable public static final char pathSeparatorChar = pathSeparator.charAt(0); static final String tmpdir = System.getProperty("java.io.tmpdir"); + /* If 0, then the system doesn't have a file name length limit. */ static int maxPathLen; static boolean caseSensitive; @@ -1130,7 +1131,9 @@ public class File implements Serializable, Comparable // Truncation rules. // `6' is the number of characters we generate. - if (prefix.length() + 6 + suffix.length() > maxPathLen) + // If maxPathLen equals zero, then the system doesn't have a limit + // on the file name, so there is nothing to truncate. + if (maxPathLen > 0 && prefix.length() + 6 + suffix.length() > maxPathLen) { int suf_len = 0; if (suffix.charAt(0) == '.') diff --git a/libjava/java/io/natFilePosix.cc b/libjava/java/io/natFilePosix.cc index d63625f57a5..ead28557f6e 100644 --- a/libjava/java/io/natFilePosix.cc +++ b/libjava/java/io/natFilePosix.cc @@ -504,6 +504,12 @@ java::io::File::performDelete (void) void java::io::File::init_native () { +#ifdef MAXPATHLEN maxPathLen = MAXPATHLEN; +#else + /* Some systems do not have a limit on the length of a file name, + the GNU system is one such example. */ + maxPathLen = 0; +#endif caseSensitive = true; } -- 2.30.2