From d4356ced2b562ac55101ab23a5321114c41e0eda Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Sun, 6 Sep 2009 20:21:28 -0600 Subject: [PATCH] doc: fix comments in recent patches * lib/faccessat.c: Mention correct function. * lib/fchmodat.c: Likewise. * lib/fchownat.c: Likewise. * lib/symlinkat.c: Likewise. * doc/posix-headers/fcntl.texi (fcntl.h): Cygwin 1.7 has AT_* constants. Signed-off-by: Eric Blake --- ChangeLog | 8 ++++++++ doc/posix-headers/fcntl.texi | 3 ++- lib/faccessat.c | 6 +++--- lib/fchmodat.c | 4 ++-- lib/fchownat.c | 4 ++-- lib/symlinkat.c | 4 ++-- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index e5ebf06cdc..04e5cc1956 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-09-06 Eric Blake + doc: fix comments in recent patches + * lib/faccessat.c: Mention correct function. + * lib/fchmodat.c: Likewise. + * lib/fchownat.c: Likewise. + * lib/symlinkat.c: Likewise. + * doc/posix-headers/fcntl.texi (fcntl.h): Cygwin 1.7 has AT_* + constants. + faccessat, symlinkat: continue cleanup of previous patch * m4/symlinkat.m4 (gl_FUNC_SYMLINKAT): Ensure dependency order. * m4/faccessat.m4 (gl_FUNC_FACCESSAT): Likewise. diff --git a/doc/posix-headers/fcntl.texi b/doc/posix-headers/fcntl.texi index 55d3ccf8f3..340cf28f95 100644 --- a/doc/posix-headers/fcntl.texi +++ b/doc/posix-headers/fcntl.texi @@ -30,7 +30,8 @@ mingw. @samp{AT_FDCWD}, @samp{AT_EACCESS}, @samp{AT_SYMLINK_NOFOLLOW}, @samp{AT_SYMLINK_FOLLOW}, and @samp{AT_REMOVEDIR} are not defined on many platforms: -glibc 2.3.6, MacOS X 10.3, FreeBSD 6.0, NetBSD 3.0, OpenBSD 3.8, AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 8, Cygwin, mingw, Interix 3.5, BeOS. +glibc 2.3.6, MacOS X 10.3, FreeBSD 6.0, NetBSD 3.0, OpenBSD 3.8, AIX +5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 8, Cygwin 1.5.x, mingw, Interix 3.5, BeOS. @item @samp{AT_FDCWD} is defined with a value too large for an @code{int} on some diff --git a/lib/faccessat.c b/lib/faccessat.c index a449b02172..42479c7fdf 100644 --- a/lib/faccessat.c +++ b/lib/faccessat.c @@ -34,9 +34,9 @@ /* Invoke access or euidaccess on file, FILE, using mode MODE, in the directory open on descriptor FD. If possible, do it without changing the - working directory. Otherwise, resort to using save_cwd/fchdir, - then mkdir/restore_cwd. If either the save_cwd or the restore_cwd - fails, then give a diagnostic and exit nonzero. + working directory. Otherwise, resort to using save_cwd/fchdir, then + (access|euidaccess)/restore_cwd. If either the save_cwd or the + restore_cwd fails, then give a diagnostic and exit nonzero. Note that this implementation only supports AT_EACCESS, although some native versions also support AT_SYMLINK_NOFOLLOW. */ diff --git a/lib/fchmodat.c b/lib/fchmodat.c index cc2776eb1e..53cafe06d5 100644 --- a/lib/fchmodat.c +++ b/lib/fchmodat.c @@ -37,8 +37,8 @@ static int lchmod (char const *f, mode_t m) { errno = ENOSYS; return -1; } Invoke chmod or lchmod on file, FILE, using mode MODE, in the directory open on descriptor FD. If possible, do it without changing the working directory. Otherwise, resort to using save_cwd/fchdir, - then mkdir/restore_cwd. If either the save_cwd or the restore_cwd - fails, then give a diagnostic and exit nonzero. + then (chmod|lchmod)/restore_cwd. If either the save_cwd or the + restore_cwd fails, then give a diagnostic and exit nonzero. Note that an attempt to use a FLAG value of AT_SYMLINK_NOFOLLOW on a system without lchmod support causes this function to fail. */ diff --git a/lib/fchownat.c b/lib/fchownat.c index ba5d86baf4..6da3537340 100644 --- a/lib/fchownat.c +++ b/lib/fchownat.c @@ -35,8 +35,8 @@ directory open on descriptor FD. If FLAG is AT_SYMLINK_NOFOLLOW, then use lchown, otherwise, use chown. If possible, do it without changing the working directory. Otherwise, resort to using save_cwd/fchdir, - then mkdir/restore_cwd. If either the save_cwd or the restore_cwd - fails, then give a diagnostic and exit nonzero. */ + then (chown|lchown)/restore_cwd. If either the save_cwd or the + restore_cwd fails, then give a diagnostic and exit nonzero. */ #define AT_FUNC_NAME fchownat #define AT_FUNC_F1 lchown diff --git a/lib/symlinkat.c b/lib/symlinkat.c index 6c1c1d5fbd..6fe752f14a 100644 --- a/lib/symlinkat.c +++ b/lib/symlinkat.c @@ -68,7 +68,7 @@ symlinkat_reversed (int fd, char const *file, char const *contents); /* Create a symlink FILE, in the directory open on descriptor FD, holding CONTENTS. If possible, do it without changing the working directory. Otherwise, resort to using save_cwd/fchdir, - then mkdir/restore_cwd. If either the save_cwd or the restore_cwd + then symlink/restore_cwd. If either the save_cwd or the restore_cwd fails, then give a diagnostic and exit nonzero. */ int @@ -90,7 +90,7 @@ symlinkat (char const *contents, int fd, char const *file) /* Read the contents of symlink FILE into buffer BUF of size LEN, in the directory open on descriptor FD. If possible, do it without changing the working directory. Otherwise, resort to using save_cwd/fchdir, - then mkdir/restore_cwd. If either the save_cwd or the restore_cwd + then readlink/restore_cwd. If either the save_cwd or the restore_cwd fails, then give a diagnostic and exit nonzero. */ #define AT_FUNC_NAME readlinkat -- 2.30.2