Author: philip
Date: Fri Dec 6 10:01:17 2013
New Revision: 1548480
URL: http://svn.apache.org/r1548480
Log:
* subversion/libsvn_subr/path.c
(svn_path_splitext): Fixed correct pointer comparison to NULL to check
for end of string, instead of checking if the character itself was NULL.
The only output change is that a pool allocated "" is now a static "".
* subversion/tests/libsvn_subr/path-test.c
(test_path_splitext): New case.
Patch by: eric{_AT_}lubin.us
me
Modified:
subversion/trunk/subversion/libsvn_subr/path.c
subversion/trunk/subversion/tests/libsvn_subr/path-test.c
Modified: subversion/trunk/subversion/libsvn_subr/path.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/path.c?rev=1548480&r1=1548479&r2=1548480&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/path.c (original)
+++ subversion/trunk/subversion/libsvn_subr/path.c Fri Dec 6 10:01:17 2013
@@ -1252,7 +1252,7 @@ svn_path_splitext(const char **path_root
anything after it? We look for the "rightmost" period in the
string. */
last_dot = strrchr(path, '.');
- if (last_dot && (last_dot + 1 != '\0'))
+ if (last_dot && (*(last_dot + 1) != '\0'))
{
/* If we have a period, we need to make sure it occurs in the
final path component -- that there's no path separator
Modified: subversion/trunk/subversion/tests/libsvn_subr/path-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/path-test.c?rev=1548480&r1=1548479&r2=1548480&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/path-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/path-test.c Fri Dec 6
10:01:17 2013
@@ -1210,6 +1210,7 @@ test_path_splitext(apr_pool_t *pool)
{ "yep.still/no-ext", "yep.still/no-ext", "" },
{ "folder.with/period.log", "folder.with/period.", "log" },
{ "period.", "period.", "" },
+ { "dir/period.", "dir/period.", "" },
{ "file.ends-with/period.", "file.ends-with/period.", "" },
{ "two-periods..txt", "two-periods..", "txt" },
{ ".dot-file", ".dot-file", "" },
