subversion: Update to 1.10.0

This commit is contained in:
Alexey Pavlov
2018-06-27 10:06:29 +03:00
parent e82c03f2f9
commit cfabeae1f0
19 changed files with 323 additions and 256 deletions

View File

@@ -4,14 +4,14 @@ From: David Rothenberger <d.rothenberger@entomo.com>
---
subversion/svnadmin/svnadmin.c | 6 ++++++
1 file changed, 6 insertions(+)
subversion/svnadmin/svnadmin.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/subversion/svnadmin/svnadmin.c b/subversion/svnadmin/svnadmin.c
index ec98c6b..3ffbf7d 100644
index eb26c5a..6267224 100644
--- a/subversion/svnadmin/svnadmin.c
+++ b/subversion/svnadmin/svnadmin.c
@@ -51,6 +51,10 @@
@@ -52,6 +52,10 @@
#include "svn_private_config.h"
@@ -22,19 +22,27 @@ index ec98c6b..3ffbf7d 100644
/*** Code. ***/
@@ -1212,6 +1216,7 @@ subcommand_dump(apr_getopt_t *os, void *baton, apr_pool_t *pool)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("First revision cannot be higher than second"));
+ setmode(STDOUT_FILENO, O_BINARY);
SVN_ERR(svn_stream_for_stdout(&stdout_stream, pool));
@@ -1359,7 +1363,10 @@ subcommand_dump(apr_getopt_t *os, void *baton, apr_pool_t *pool)
out_stream = svn_stream_from_aprfile2(file, FALSE, pool);
}
else
- SVN_ERR(svn_stream_for_stdout(&out_stream, pool));
+ {
+ setmode(STDOUT_FILENO, O_BINARY);
+ SVN_ERR(svn_stream_for_stdout(&out_stream, pool));
+ }
/* Progress feedback goes to STDERR, unless they asked to suppress it. */
@@ -1401,6 +1406,7 @@ subcommand_load(apr_getopt_t *os, void *baton, apr_pool_t *pool)
SVN_ERR(open_repos(&repos, opt_state->repository_path, pool));
/* Read the stream from STDIN. Users can redirect a file. */
+ setmode(STDIN_FILENO, O_BINARY);
SVN_ERR(svn_stream_for_stdin(&stdin_stream, pool));
if (! opt_state->quiet)
@@ -1635,7 +1642,10 @@ subcommand_load(apr_getopt_t *os, void *baton, apr_pool_t *pool)
SVN_ERR(svn_stream_open_readonly(&in_stream, opt_state->file,
pool, pool));
else
- SVN_ERR(svn_stream_for_stdin2(&in_stream, TRUE, pool));
+ {
+ setmode(STDIN_FILENO, O_BINARY);
+ SVN_ERR(svn_stream_for_stdin2(&in_stream, TRUE, pool));
+ }
/* Progress feedback goes to STDOUT, unless they asked to suppress it. */
if (! opt_state->quiet)