Author: svn-role
Date: Fri Jan 19 04:00:11 2018
New Revision: 1821588
URL: http://svn.apache.org/viewvc?rev=1821588&view=rev
Log:
Merge r1821224 from trunk:
* r1821224
Rename and move the new-for-1.10 function 'svn_io_stdin_readline()'.
Justification:
This function is not a good fit for our public API.
See discussion which starts here:
https://svn.haxx.se/dev/archive-2018-01/0054.shtml
Votes:
+1: stsp, julianfoad, danielsh
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/include/private/svn_cmdline_private.h
subversion/branches/1.10.x/subversion/include/svn_io.h
subversion/branches/1.10.x/subversion/libsvn_subr/cmdline.c
subversion/branches/1.10.x/subversion/libsvn_subr/io.c
subversion/branches/1.10.x/subversion/svn/svn.c
subversion/branches/1.10.x/subversion/svnbench/svnbench.c
subversion/branches/1.10.x/subversion/svnmucc/svnmucc.c
subversion/branches/1.10.x/subversion/svnrdump/svnrdump.c
subversion/branches/1.10.x/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
subversion/branches/1.10.x/tools/client-side/svnconflict/svnconflict.c
subversion/branches/1.10.x/tools/dev/svnmover/svnmover.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 19 04:00:11 2018
@@ -99,4 +99,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820518,1821183
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820518,1821183,1821224
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Jan 19 04:00:11 2018
@@ -54,12 +54,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1821224
- Rename and move the new-for-1.10 function 'svn_io_stdin_readline()'.
- Justification:
- This function is not a good fit for our public API.
- See discussion which starts here:
- https://svn.haxx.se/dev/archive-2018-01/0054.shtml
- Votes:
- +1: stsp, julianfoad, danielsh
Modified:
subversion/branches/1.10.x/subversion/include/private/svn_cmdline_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/include/private/svn_cmdline_private.h?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/include/private/svn_cmdline_private.h
(original)
+++ subversion/branches/1.10.x/subversion/include/private/svn_cmdline_private.h
Fri Jan 19 04:00:11 2018
@@ -269,6 +269,15 @@ svn_cmdline__disable_cancellation_handle
void
svn_cmdline__cancellation_exit(void);
+/** Reads a string from stdin until a newline or EOF is found
+ *
+ * @since New in 1.10.
+ */
+svn_error_t *
+svn_cmdline__stdin_readline(const char **result,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/branches/1.10.x/subversion/include/svn_io.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/include/svn_io.h?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/include/svn_io.h (original)
+++ subversion/branches/1.10.x/subversion/include/svn_io.h Fri Jan 19 04:00:11
2018
@@ -2635,15 +2635,6 @@ svn_io_file_readline(apr_file_t *file,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/** Reads a string from stdin until a newline or EOF is found
- *
- * @since New in 1.10.
- */
-svn_error_t *
-svn_io_stdin_readline(const char **result,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/** @} */
#ifdef __cplusplus
Modified: subversion/branches/1.10.x/subversion/libsvn_subr/cmdline.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_subr/cmdline.c?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_subr/cmdline.c Fri Jan 19
04:00:11 2018
@@ -343,6 +343,23 @@ svn_cmdline_path_local_style_from_utf8(c
}
svn_error_t *
+svn_cmdline__stdin_readline(const char **result,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ svn_stringbuf_t *buf = NULL;
+ svn_stream_t *stdin_stream = NULL;
+ svn_boolean_t oob = FALSE;
+
+ SVN_ERR(svn_stream_for_stdin2(&stdin_stream, TRUE, scratch_pool));
+ SVN_ERR(svn_stream_readline(stdin_stream, &buf, APR_EOL_STR, &oob,
result_pool));
+
+ *result = buf->data;
+
+ return SVN_NO_ERROR;
+}
+
+svn_error_t *
svn_cmdline_printf(apr_pool_t *pool, const char *fmt, ...)
{
const char *message;
Modified: subversion/branches/1.10.x/subversion/libsvn_subr/io.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_subr/io.c?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_subr/io.c Fri Jan 19 04:00:11
2018
@@ -5440,20 +5440,3 @@ svn_io_file_readline(apr_file_t *file,
return SVN_NO_ERROR;
}
-
-svn_error_t *
-svn_io_stdin_readline(const char **result,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- svn_stringbuf_t *buf = NULL;
- svn_stream_t *stdin_stream = NULL;
- svn_boolean_t oob = FALSE;
-
- SVN_ERR(svn_stream_for_stdin2(&stdin_stream, TRUE, scratch_pool));
- SVN_ERR(svn_stream_readline(stdin_stream, &buf, APR_EOL_STR, &oob,
result_pool));
-
- *result = buf->data;
-
- return SVN_NO_ERROR;
-}
Modified: subversion/branches/1.10.x/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svn/svn.c?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.10.x/subversion/svn/svn.c Fri Jan 19 04:00:11 2018
@@ -3165,7 +3165,7 @@ sub_main(int *exit_code, int argc, const
/* Get password from stdin if necessary */
if (read_pass_from_stdin)
{
- SVN_ERR(svn_io_stdin_readline(&opt_state.auth_password, pool, pool));
+ SVN_ERR(svn_cmdline__stdin_readline(&opt_state.auth_password, pool,
pool));
}
/* Set up our cancellation support. */
Modified: subversion/branches/1.10.x/subversion/svnbench/svnbench.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svnbench/svnbench.c?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svnbench/svnbench.c (original)
+++ subversion/branches/1.10.x/subversion/svnbench/svnbench.c Fri Jan 19
04:00:11 2018
@@ -938,7 +938,7 @@ sub_main(int *exit_code, int argc, const
/* Get password from stdin if necessary */
if (read_pass_from_stdin)
{
- SVN_ERR(svn_io_stdin_readline(&opt_state.auth_password, pool, pool));
+ SVN_ERR(svn_cmdline__stdin_readline(&opt_state.auth_password, pool,
pool));
}
/* Set up our cancellation support. */
Modified: subversion/branches/1.10.x/subversion/svnmucc/svnmucc.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svnmucc/svnmucc.c?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svnmucc/svnmucc.c (original)
+++ subversion/branches/1.10.x/subversion/svnmucc/svnmucc.c Fri Jan 19 04:00:11
2018
@@ -740,7 +740,7 @@ sub_main(int *exit_code, int argc, const
/* Get password from stdin if necessary */
if (read_pass_from_stdin)
{
- SVN_ERR(svn_io_stdin_readline(&password, pool, pool));
+ SVN_ERR(svn_cmdline__stdin_readline(&password, pool, pool));
}
SVN_ERR(svn_client_create_context2(&ctx, cfg_hash, pool));
Modified: subversion/branches/1.10.x/subversion/svnrdump/svnrdump.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svnrdump/svnrdump.c?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svnrdump/svnrdump.c (original)
+++ subversion/branches/1.10.x/subversion/svnrdump/svnrdump.c Fri Jan 19
04:00:11 2018
@@ -1093,7 +1093,7 @@ sub_main(int *exit_code, int argc, const
/* Get password from stdin if necessary */
if (read_pass_from_stdin)
{
- SVN_ERR(svn_io_stdin_readline(&password, pool, pool));
+ SVN_ERR(svn_cmdline__stdin_readline(&password, pool, pool));
}
non_interactive = !svn_cmdline__be_interactive(non_interactive,
Modified:
subversion/branches/1.10.x/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
---
subversion/branches/1.10.x/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
(original)
+++
subversion/branches/1.10.x/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
Fri Jan 19 04:00:11 2018
@@ -807,7 +807,7 @@ sub_main(int *exit_code, int argc, const
/* Get password from stdin if necessary */
if (read_pass_from_stdin)
{
- SVN_ERR(svn_io_stdin_readline(&opt_state.auth_password, pool, pool));
+ SVN_ERR(svn_cmdline__stdin_readline(&opt_state.auth_password, pool,
pool));
}
/* Create a client context object. */
Modified: subversion/branches/1.10.x/tools/client-side/svnconflict/svnconflict.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/tools/client-side/svnconflict/svnconflict.c?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/tools/client-side/svnconflict/svnconflict.c
(original)
+++ subversion/branches/1.10.x/tools/client-side/svnconflict/svnconflict.c Fri
Jan 19 04:00:11 2018
@@ -857,7 +857,7 @@ sub_main(int *exit_code, int argc, const
/* Get password from stdin if necessary */
if (read_pass_from_stdin)
{
- SVN_ERR(svn_io_stdin_readline(&opt_state.auth_password, pool, pool));
+ SVN_ERR(svn_cmdline__stdin_readline(&opt_state.auth_password, pool,
pool));
}
Modified: subversion/branches/1.10.x/tools/dev/svnmover/svnmover.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/tools/dev/svnmover/svnmover.c?rev=1821588&r1=1821587&r2=1821588&view=diff
==============================================================================
--- subversion/branches/1.10.x/tools/dev/svnmover/svnmover.c (original)
+++ subversion/branches/1.10.x/tools/dev/svnmover/svnmover.c Fri Jan 19
04:00:11 2018
@@ -4596,7 +4596,7 @@ sub_main(int *exit_code, int argc, const
/* Get password from stdin if necessary */
if (read_pass_from_stdin)
{
- SVN_ERR(svn_io_stdin_readline(&password, pool, pool));
+ SVN_ERR(svn_cmdline__stdin_readline(&password, pool, pool));
}
SVN_ERR(svn_client_create_context2(&ctx, cfg_hash, pool));
