You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2018/01/16 09:36:14 UTC
svn commit: r1821224 - in /subversion/trunk: subversion/include/
subversion/include/private/ subversion/libsvn_subr/ subversion/svn/
subversion/svnbench/ subversion/svnmucc/ subversion/svnrdump/
tools/client-side/svn-mergeinfo-normalizer/ tools/client-...
Author: julianfoad
Date: Tue Jan 16 09:36:13 2018
New Revision: 1821224
URL: http://svn.apache.org/viewvc?rev=1821224&view=rev
Log:
Rename and move the new-for-1.10 function 'svn_io_stdin_readline()' to
'svn_cmdline__stdin_readline()'.
It is just a wrapper around existing API functions and lacks some checking and
options so was deemed not suitable to go into the public API in its current
form.
* subversion/include/private/svn_cmdline_private.h,
subversion/libsvn_subr/cmdline.c
(svn_cmdline__stdin_readline): Rename and move to here...
* subversion/include/svn_io.h
* subversion/libsvn_subr/io.c
(svn_io_stdin_readline): ... from here.
* subversion/svnbench/svnbench.c,
subversion/svnmucc/svnmucc.c,
subversion/svnrdump/svnrdump.c,
subversion/svn/svn.c,
tools/client-side/svnconflict/svnconflict.c,
tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c,
tools/dev/svnmover/svnmover.c
(sub_main): Track the rename.
Modified:
subversion/trunk/subversion/include/private/svn_cmdline_private.h
subversion/trunk/subversion/include/svn_io.h
subversion/trunk/subversion/libsvn_subr/cmdline.c
subversion/trunk/subversion/libsvn_subr/io.c
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/svnbench/svnbench.c
subversion/trunk/subversion/svnmucc/svnmucc.c
subversion/trunk/subversion/svnrdump/svnrdump.c
subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
subversion/trunk/tools/client-side/svnconflict/svnconflict.c
subversion/trunk/tools/dev/svnmover/svnmover.c
Modified: subversion/trunk/subversion/include/private/svn_cmdline_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_cmdline_private.h?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_cmdline_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_cmdline_private.h Tue Jan 16 09:36:13 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/trunk/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_io.h?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_io.h (original)
+++ subversion/trunk/subversion/include/svn_io.h Tue Jan 16 09:36:13 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/trunk/subversion/libsvn_subr/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cmdline.c?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cmdline.c Tue Jan 16 09:36:13 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/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Tue Jan 16 09:36:13 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/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Tue Jan 16 09:36:13 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/trunk/subversion/svnbench/svnbench.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnbench/svnbench.c?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/subversion/svnbench/svnbench.c (original)
+++ subversion/trunk/subversion/svnbench/svnbench.c Tue Jan 16 09:36:13 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/trunk/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.c (original)
+++ subversion/trunk/subversion/svnmucc/svnmucc.c Tue Jan 16 09:36:13 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/trunk/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Tue Jan 16 09:36:13 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/trunk/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c (original)
+++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c Tue Jan 16 09:36:13 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/trunk/tools/client-side/svnconflict/svnconflict.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnconflict/svnconflict.c?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svnconflict/svnconflict.c (original)
+++ subversion/trunk/tools/client-side/svnconflict/svnconflict.c Tue Jan 16 09:36:13 2018
@@ -858,7 +858,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/trunk/tools/dev/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnmover/svnmover.c?rev=1821224&r1=1821223&r2=1821224&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnmover/svnmover.c (original)
+++ subversion/trunk/tools/dev/svnmover/svnmover.c Tue Jan 16 09:36:13 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));