Mention if terminating null is included in NAME_MAX/PATH_MAX

Fixes BZ #14872.

diff --git a/ChangeLog b/ChangeLog
index dc7d0456e593dd04c8e2b8e79ba24519f1fbef9d..9710e09b9e793123ebbb9111b8b42dcbdec108fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-11  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+       [BZ #14872]
+       * manual/conf.texi (Limits on File System Capacity): Mention if
+       terminating null is included in the max size.
+
 2012-12-10  Andreas Jaeger  <aj@suse.de>
 
        * po/cs.po: Update from translation team.

diff --git a/NEWS b/NEWS
index bbd7985fd951640c15c7c70f94a37c6d42c3ebea..9b2e65170c006ec881698fa873ae28089be449cc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,8 +22,8 @@ Version 2.17
   14660, 14661, 14669, 14672, 14683, 14694, 14716, 14719, 14743, 14767,
   14783, 14784, 14785, 14793, 14796, 14797, 14801, 14803, 14805, 14807,
   14811, 14815, 14821, 14822, 14824, 14828, 14831, 14833, 14835, 14838,
-  14856, 14863, 14865, 14866, 14868, 14869, 14871, 14879, 14889, 14893,
-  14898, 14914.
+  14856, 14863, 14865, 14866, 14868, 14869, 14871, 14872, 14879, 14889,
+  14893, 14898, 14914.
 
 * CVE-2011-4609 svc_run() produces high cpu usage when accept fails with
   EMFILE has been fixed (Bugzilla #14889).

diff --git a/manual/conf.texi b/manual/conf.texi
index 61dc260317f560263a432982f6c6f06a2afbe03f..55ca4d10cd0eb3bb27577433f752f3b223c6fdae 100644 (file)
--- a/manual/conf.texi
+++ b/manual/conf.texi
@@ -1147,14 +1147,16 @@ typed ahead as input.  @xref{I/O Queues}.
 @comment limits.h
 @comment POSIX.1
 @deftypevr Macro int NAME_MAX
-The uniform system limit (if any) for the length of a file name component.
+The uniform system limit (if any) for the length of a file name component, not
+including the terminating null character.
 @end deftypevr
 
 @comment limits.h
 @comment POSIX.1
 @deftypevr Macro int PATH_MAX
 The uniform system limit (if any) for the length of an entire file name (that
-is, the argument given to system calls such as @code{open}).
+is, the argument given to system calls such as @code{open}), including the
+terminating null character.
 @end deftypevr
 
 @cindex limits, pipe buffer size