svn commit: r1821894 - /subversion/trunk/subversion/libsvn_client/shelf.c

[ju...@apache.org]

Author: julianfoad
Date: Mon Jan 22 16:48:18 2018
New Revision: 1821894

URL: http://svn.apache.org/viewvc?rev=1821894&view=rev
Log:
Shelving: fix shelf listing and choosing the newest by default.

* subversion/svn/svn.c
  (shelf_name_from_filename): Use the correct suffix length.

Modified:
    subversion/trunk/subversion/libsvn_client/shelf.c

Modified: subversion/trunk/subversion/libsvn_client/shelf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/shelf.c?rev=1821894&r1=1821893&r2=1821894&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/shelf.c (original)
+++ subversion/trunk/subversion/libsvn_client/shelf.c Mon Jan 22 16:48:18 2018
@@ -98,10 +98,12 @@ shelf_name_from_filename(char **name,
                          apr_pool_t *result_pool)
 {
   size_t len = strlen(filename);
+  static const char suffix[] = ".current";
+  int suffix_len = sizeof(suffix) - 1;
 
-  if (len > 8 && strcmp(filename + len - 8, ".current") == 0)
+  if (len > suffix_len && strcmp(filename + len - suffix_len, suffix) == 0)
     {
-      char *codename = apr_pstrndup(result_pool, filename, len - 6);
+      char *codename = apr_pstrndup(result_pool, filename, len - suffix_len);
       SVN_ERR(shelf_name_decode(name, codename, result_pool));
     }
   else