diff src/sysfile.h @ 2421:ab71ad6ff3dd

[xemacs-hg @ 2004-12-06 03:50:53 by ben] (none) README.packages: Document use of --package-prefix. Fix error in specifying standard package location. make-docfile.c: Use QXE_PATH_MAX. info.el: Correct doc string giving example package path. menubar-items.el: Move Prefix Rectangle command up one level. xemacs/packages.texi: Add long form of Lisp Reference Manual to links. Add links pointing to Lisp Reference Manual for more detailed package discussion. lispref/range-tables.texi: Document range-table changes. internals/internals.texi: Update history section. elhash.c, elhash.h, profile.c: Create inchash_eq() to allow direct incrementing of hash-table entry. Use in profile.c to try to reduce profiling overhead. Increase initial size of profile hash tables to reduce profiling overhead. buffer.c, device-msw.c, dialog-msw.c, dired-msw.c, editfns.c, event-msw.c, events.c, glyphs-msw.c, keymap.c, objects-msw.c, process-nt.c, syswindows.h, text.c, text.h, unexnt.c: Rename xetcs* -> qxetcs* for consistency with qxestr*. Rename ei*_c(_*) -> ei*_ascii(_*) since they work with ASCII-only strings not "C strings", whatever those are. This is the last place where "c" was incorrectly being used for "ascii". dialog-msw.c, dumper.c, event-msw.c, fileio.c, glyphs-gtk.c, glyphs-x.c, nt.c, process-nt.c, realpath.c, sysdep.c, sysfile.h, unexcw.c, unexnext.c, unexnt.c: Try to avoid differences in systems that do or do not include final null byte in PATH_MAX. Create PATH_MAX_INTERNAL and PATH_MAX_EXTERNAL and use them everywhere. Rewrite code in dumper.c to avoid use of PATH_MAX. When necessary in nt.c, use _MAX_PATH instead of MAX_PATH to be consistent with other places. text.c: Code to short-circuit when binary or Unicode was not working due to EOL wrapping. Fix this code to work when either no EOL autodetection or no CR's or LF's in the text. lisp.h, rangetab.c, rangetab.h, regex.c, search.c: Implement different types of ranges (open/closed start and end). Change default to be start-closed, end-open.
author ben
date Mon, 06 Dec 2004 03:52:23 +0000
parents ecf1ebac70d8
children 902d5bd9b75c
line wrap: on
line diff
--- a/src/sysfile.h	Mon Dec 06 03:46:07 2004 +0000
+++ b/src/sysfile.h	Mon Dec 06 03:52:23 2004 +0000
@@ -1,6 +1,6 @@
 /*
    Copyright (C) 1995 Free Software Foundation, Inc.
-   Copyright (C) 2000, 2001, 2002 Ben Wing.
+   Copyright (C) 2000, 2001, 2002, 2004 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -267,20 +267,43 @@
 #define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
 #endif
 
-/* Client .c files should simply use `PATH_MAX'. */
-#ifndef PATH_MAX
-# if defined (_MAX_PATH)
+/* Determining the maximum pathname length.
+
+   NOTE: IN GENERAL, YOU SHOULD NOT USE THIS.
+   If at all possible, avoid using fixed-length buffers of any sort.
+   You cannot guarantee on many systems that pathnames won't exceed
+   these limits for one reason or another.
+
+   Unfortunately, there is no universal agreement over whether these
+   values should include a final null-terminator or not.  Even recent
+   versions of Linux (circa 2002) are switching from the not-including-
+   terminator kind to the including-terminator kind.  So we assume that
+   the including-terminator kind will be even (usually is), and round
+   up as necessary. */
+    
+#define ROUND_UP_TO_EVEN_NUMBER(val) (((val + 1) >> 1) << 1)
+#ifdef PATH_MAX
+# define QXE_PATH_MAX ROUND_UP_TO_EVEN_NUMBER (PATH_MAX)
+#elif defined (_MAX_PATH)
 /* MS Win -- and preferable to _POSIX_PATH_MAX, which is also defined */
-#  define PATH_MAX _MAX_PATH
-# elif defined (_POSIX_PATH_MAX)
-#  define PATH_MAX _POSIX_PATH_MAX
-# elif defined (MAXPATHLEN)
-#  define PATH_MAX MAXPATHLEN
-# else
-#  define PATH_MAX 1024
-# endif
+# define QXE_PATH_MAX ROUND_UP_TO_EVEN_NUMBER (_MAX_PATH)
+#elif defined (_POSIX_PATH_MAX)
+# define QXE_PATH_MAX ROUND_UP_TO_EVEN_NUMBER (_POSIX_PATH_MAX)
+#elif defined (MAXPATHLEN)
+# define QXE_PATH_MAX ROUND_UP_TO_EVEN_NUMBER (MAXPATHLEN)
+#else
+# define QXE_PATH_MAX 1024
 #endif
 
+/* Client .c files should use PATH_MAX_INTERNAL or PATH_MAX_EXTERNAL
+   if they must use either one at all. */
+
+/* Use for internally formatted text, which can potentially have up to
+   four bytes per character */
+#define PATH_MAX_INTERNAL (QXE_PATH_MAX * MAX_ICHAR_LEN)
+/* Use for externally formatted text. */
+#define PATH_MAX_EXTERNAL (QXE_PATH_MAX * MAX_XETCHAR_SIZE)
+
 /* The following definitions are needed under Windows, at least */
 #ifndef X_OK
 # define X_OK 1