svn commit: r1925830 - in /subversion/branches/utf8-cmdline-prototype/subversion/svn: cl.h svn.c

Author: rinrab
Date: Mon May 26 15:58:42 2025
New Revision: 1925830

URL: http://svn.apache.org/viewvc?rev=1925830&view=rev
Log:
On the 'utf8-cmdline-prototype' branch: use utf8-ized version of `--encoding`
argument.

According to my research, this should not affect the behaviour at all, even
though the comment was saying completely opposite. 

* subversion/svn/cl.h
  (svn_cl__opt_state_t::encoding): Remove comment explaining that it wasn't
   suppose to be utf8 encoded.
* subversion/svn/svn.c
  (sub_main::opt_encoding): Make sure to use utf8_opt_arg instead.

Modified:
    subversion/branches/utf8-cmdline-prototype/subversion/svn/cl.h
    subversion/branches/utf8-cmdline-prototype/subversion/svn/svn.c

Modified: subversion/branches/utf8-cmdline-prototype/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/svn/cl.h?rev=1925830&r1=1925829&r2=1925830&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/svn/cl.h (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/svn/cl.h Mon May 26 15:58:42 2025
@@ -185,7 +185,7 @@ typedef struct svn_cl__opt_state_t
   svn_stringbuf_t *filedata;     /* contents of file used as option data
                                     (not converted to UTF-8) */
   const char *encoding;          /* the locale/encoding of 'message' and of
-                                    'filedata' (not converted to UTF-8) */
+                                    'filedata' */
   svn_boolean_t help;            /* print usage message */
   const char *auth_username;     /* auth username */
   const char *auth_password;     /* auth password */

Modified: subversion/branches/utf8-cmdline-prototype/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/svn/svn.c?rev=1925830&r1=1925829&r2=1925830&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/svn/svn.c (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/svn/svn.c Mon May 26 15:58:42 2025
@@ -2468,7 +2468,7 @@ sub_main(int *exit_code,
         read_pass_from_stdin = TRUE;
         break;
       case opt_encoding:
-        opt_state.encoding = apr_pstrdup(pool, opt_arg);
+        opt_state.encoding = apr_pstrdup(pool, utf8_opt_arg);
         break;
       case opt_xml:
         opt_state.xml = TRUE;