From a5fc828950c79ec061ffab67ea6c5c6862dfb0ec Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 3 Jan 2012 01:08:24 +0100 Subject: [PATCH] canonicalize: Tweak 2011-12-29 commit. * lib/canonicalize.c (canonicalize_filename_mode): Fix typo in comment. * lib/canonicalize.h (canonicalize_filename_mode): Update specification. --- ChangeLog | 6 ++++++ lib/canonicalize.c | 2 +- lib/canonicalize.h | 10 ++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04a3bfa38..2e2c71b07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-02 Bruno Haible + + canonicalize: Tweak 2011-12-29 commit. + * lib/canonicalize.c (canonicalize_filename_mode): Fix typo in comment. + * lib/canonicalize.h (canonicalize_filename_mode): Update specification. + 2012-01-02 Jim Meyering gitlog-to-changelog: describe input syntax in --help output diff --git a/lib/canonicalize.c b/lib/canonicalize.c index e5fac7d8d..5bcd0cc9b 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -84,7 +84,7 @@ seen_triple (Hash_table **ht, char const *filename, struct stat const *st) /* 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. */ diff --git a/lib/canonicalize.h b/lib/canonicalize.h index b4675b499..9d83ed698 100644 --- a/lib/canonicalize.h +++ b/lib/canonicalize.h @@ -37,10 +37,12 @@ enum canonicalize_mode_t }; 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_ */ -- 2.11.0