Skip to content

Commit 5bd5db6

Browse files
committed
On the 'utf8-cmdline-prototype' branch: UTF8-ize svnversion program.
* subversion/svnversion/svnversion.c (includes): Remove svn_utf.h because we no longer use it. (sub_main): Directly convert argv to UTF8 and remove all following convertions. * BRANCH-README.md: Update status. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/utf8-cmdline-prototype@1930392 13f79535-47bb-0310-9956-ffa450edef68
1 parent f7d85bf commit 5bd5db6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

BRANCH-README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ svnmucc | UTF8-ized
1111
svnrdump | UTF8-ized
1212
svnserve | UTF8-ized
1313
svnsync | UTF8-ized
14-
svnversion | ASCII
14+
svnversion | UTF8-ized
1515
svn | UTF8-ized
1616
svn-mergeinfo-normalizer | ASCII
1717
svnconflict | ASCII

subversion/svnversion/svnversion.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "svn_dirent_uri.h"
2424
#include "svn_pools.h"
2525
#include "svn_wc.h"
26-
#include "svn_utf.h"
2726
#include "svn_opt.h"
2827
#include "svn_version.h"
2928

@@ -154,7 +153,7 @@ sub_main(int *exit_code,
154153
/* Check library versions */
155154
SVN_ERR(check_lib_versions());
156155

157-
SVN_ERR(svn_cmdline__get_cstring_argv(&argv, argc, cmdline_argv, pool));
156+
SVN_ERR(svn_cmdline__get_utf8_argv(&argv, argc, cmdline_argv, pool));
158157

159158
#if defined(WIN32) || defined(__CYGWIN__)
160159
/* Set the working copy administrative directory name. */
@@ -217,16 +216,17 @@ sub_main(int *exit_code,
217216
return SVN_NO_ERROR;
218217
}
219218

220-
SVN_ERR(svn_utf_cstring_to_utf8(&wc_path,
221-
(os->ind < argc) ? os->argv[os->ind] : ".",
222-
pool));
219+
if (os->ind < argc)
220+
wc_path = os->argv[os->ind];
221+
else
222+
wc_path = ".";
223223

224224
SVN_ERR(svn_opt__arg_canonicalize_path(&wc_path, wc_path, pool));
225225
SVN_ERR(svn_dirent_get_absolute(&local_abspath, wc_path, pool));
226226
SVN_ERR(svn_wc_context_create(&wc_ctx, NULL, pool, pool));
227227

228228
if (os->ind+1 < argc)
229-
SVN_ERR(svn_utf_cstring_to_utf8(&trail_url, os->argv[os->ind+1], pool));
229+
trail_url = os->argv[os->ind+1];
230230
else
231231
trail_url = NULL;
232232

0 commit comments

Comments
 (0)