svn commit: r1095801 - /subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c

[rhuijben]

Author: rhuijben
Date: Thu Apr 21 19:55:30 2011
New Revision: 1095801

URL: http://svn.apache.org/viewvc?rev=1095801&view=rev
Log:
Resolve a few minor issues in lock-wc-dir, which caused a segfault when
invoked incorrectly.

* subversion/tests/cmdline/lock-wc-dir.c
  (KEY_OLD_PROPVAL
   KEY_NEW_PROPVAL): Remove unused macros.
  (obtain_lock): Fix message.
  (main): Verify arguments correctly.

Modified:
    subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c

Modified: subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c?rev=1095801&r1=1095800&r2=1095801&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c (original)
+++ subversion/trunk/subversion/tests/cmdline/lock-wc-dir.c Thu Apr 21 19:55:30 
2011
@@ -38,10 +38,6 @@
 
 #include "svn_private_config.h"
 
-
-#define KEY_OLD_PROPVAL "old_value_p"
-#define KEY_NEW_PROPVAL "value"
-
 #define USAGE_MSG \
   "Usage: %s [-r|-1] DIRNAME\n" \
   "\n" \
@@ -72,8 +68,8 @@ obtain_lock(const char *path, svn_boolea
                                        scratch_pool));
     }
 
-  SVN_ERR(svn_cmdline_printf(scratch_pool, "Lock on '%s' obtained (and we "
-                             "are not going to release it...\n",
+  SVN_ERR(svn_cmdline_printf(scratch_pool, "Lock on '%s' obtained, and we "
+                             "are not going to release it.\n",
                              svn_dirent_local_style(local_abspath,
                                                     scratch_pool)));
 
@@ -88,10 +84,11 @@ main(int argc, const char *argv[])
   svn_error_t *err;
   svn_boolean_t recursive;
 
-  if (argc < 2 || argc > 3)
+  if (argc != 3
+      || (strcmp(argv[1], "-1") && apr_strnatcmp(argv[1], "-r")))
     {
       fprintf(stderr, USAGE_MSG, argv[0]);
-      exit(1);
+      exit(EXIT_FAILURE);
     }
 
   if (apr_initialize() != APR_SUCCESS)