svn commit: r1882313 - /subversion/trunk/subversion/libsvn_subr/cmdline.c

[fu...@apache.org]

Author: futatuki
Date: Thu Oct  8 04:53:51 2020
New Revision: 1882313

URL: http://svn.apache.org/viewvc?rev=1882313&view=rev
Log:
Revert r1882235.

r1882235 has a regression that non ascii path cannot be used on
non-utf-8 code page on Windows[1]. So we revert it until the issue will
be resolved.

[1] https://mail-archives.apache.org/mod_mbox/subversion-dev/202010.mbox/%3c72f3ca8f-8b27-bf4e-80d2-5654dc41b82e@gmail.com%3e

* subversion/libsvn_subr/cmdline.c

Found by: jun66j5

Modified:
    subversion/trunk/subversion/libsvn_subr/cmdline.c

Modified: subversion/trunk/subversion/libsvn_subr/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cmdline.c?rev=1882313&r1=1882312&r2=1882313&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cmdline.c Thu Oct  8 04:53:51 2020
@@ -1406,9 +1406,6 @@ svn_cmdline__edit_file_externally(const
 {
   const char *editor, *cmd, *base_dir, *file_name, *base_dir_apr;
   const char *file_name_local;
-#ifdef WIN32
-  const WCHAR *wcmd;
-#endif
   char *old_cwd;
   int sys_err;
   apr_status_t apr_err;
@@ -1437,12 +1434,7 @@ svn_cmdline__edit_file_externally(const
   /* editor is explicitly documented as being interpreted by the user's shell,
      and as such should already be quoted/escaped as needed. */
   cmd = apr_psprintf(pool, "%s %s", editor, file_name_local);
-#ifndef WIN32
   sys_err = system(cmd);
-#else
-  SVN_ERR(svn_utf__win32_utf8_to_utf16(&wcmd, cmd, NULL, pool));
-  sys_err = _wsystem(wcmd);
-#endif
 
   apr_err = apr_filepath_set(old_cwd, pool);
   if (apr_err)
@@ -1474,9 +1466,6 @@ svn_cmdline__edit_string_externally(svn_
 {
   const char *editor;
   const char *cmd;
-#ifdef WIN32
-  const WCHAR *wcmd;
-#endif
   apr_file_t *tmp_file;
   const char *tmpfile_name;
   const char *tmpfile_native;
@@ -1618,12 +1607,7 @@ svn_cmdline__edit_string_externally(svn_
     }
 
   /* Now, run the editor command line.  */
-#ifndef WIN32
   sys_err = system(cmd);
-#else
-  SVN_ERR(svn_utf__win32_utf8_to_utf16(&wcmd, cmd, NULL, pool));
-  sys_err = _wsystem(wcmd);
-#endif
   if (sys_err != 0)
     {
       /* Extracting any meaning from sys_err is platform specific, so just