Re: [PATCH] canonicalize: add support for not resolving symlinks

[Bruno Haible]

Pádraig Brady wrote:
> This is for use in a proposed coreutils `realpath` command.

The comment in the .c file is now not in sync with the one in the .h file,
and it has a typo.

Are you ok with this amendment?


2012-01-02  Bruno Haible  <address@hidden>

        canonicalize: Tweak 2011-12-29 commit.
        * lib/canonicalize.c (canonicalize_filename_mode): Fix typo in comment.
        * lib/canonicalize.h (canonicalize_filename_mode): Update specification.

--- lib/canonicalize.c.orig     Mon Jan  2 20:47:58 2012
+++ lib/canonicalize.c  Mon Jan  2 19:06:23 2012
@@ -84,7 +84,7 @@
 /* Return the canonical absolute name of file NAME, while treating
    missing elements according to CAN_MODE.  A canonical name
    does not contain any `.', `..' components nor any repeated file name
-   separators ('/') or, depdending on other CAN_MODE flags, symlinks.
+   separators ('/') or, depending on other CAN_MODE flags, symlinks.
    Whether components must exist or not depends on canonicalize mode.
    The result is malloc'd.  */
 
--- lib/canonicalize.h.orig     Mon Jan  2 20:47:58 2012
+++ lib/canonicalize.h  Mon Jan  2 20:46:39 2012
@@ -37,10 +37,12 @@
   };
 typedef enum canonicalize_mode_t canonicalize_mode_t;
 
-/* Return a malloc'd string containing the canonical absolute name of
-   the named file.  This acts like canonicalize_file_name, except that
-   whether components must exist depends on the canonicalize_mode_t
-   argument.  */
+/* Return the canonical absolute name of file NAME, while treating
+   missing elements according to CAN_MODE.  A canonical name
+   does not contain any `.', `..' components nor any repeated file name
+   separators ('/') or, depending on other CAN_MODE flags, symlinks.
+   Whether components must exist or not depends on canonicalize mode.
+   The result is malloc'd.  */
 char *canonicalize_filename_mode (const char *, canonicalize_mode_t);
 
 #endif /* !CANONICALIZE_H_ */