Author: rinrab
Date: Sat Sep 7 11:11:59 2024
New Revision: 1920507
URL: http://svn.apache.org/viewvc?rev=1920507&view=rev
Log:
On the 'cmake' branch: Sync the branch with trunk.
* Merged all revisions from 'trunk'.
Removed:
subversion/branches/cmake/contrib/server-side/backup-recipe.sh
subversion/branches/cmake/contrib/server-side/svnmirror-test.sh
subversion/branches/cmake/contrib/server-side/svnmirror.sh
Modified:
subversion/branches/cmake/ (props changed)
subversion/branches/cmake/INSTALL
subversion/branches/cmake/subversion/libsvn_subr/sysinfo.c
subversion/branches/cmake/subversion/svnlook/svnlook.c
subversion/branches/cmake/subversion/svnserve/svnserve.c
subversion/branches/cmake/tools/dev/awk/buildwin.bat
Propchange: subversion/branches/cmake/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1919068-1919488,1919506-1920467,1920469-1920506
Modified: subversion/branches/cmake/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/cmake/INSTALL?rev=1920507&r1=1920506&r2=1920507&view=diff
==============================================================================
--- subversion/branches/cmake/INSTALL (original)
+++ subversion/branches/cmake/INSTALL Sat Sep 7 11:11:59 2024
@@ -868,9 +868,8 @@ II. INSTALLATION
* Python 2.7 or higher, downloaded from https://www.python.org/ which is
used to generate the project files.
* Perl 5.8 or higher from https://www.perl.org/get.html
- * Awk (from https://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
- needed to compile Apache. Note that this is the actual awk program,
- not an installer - just rename it to awk.exe and it is ready to use.
+ * Awk is needed to compile Apache. Source code is available in
+ tools\dev\awk, run the buildwin.bat program to compile.
* Apache apr, apr-util, and optionally apr-iconv libraries, version
1.4 or later (1.2 for apr-iconv). If you are building from a Subversion
checkout and have not downloaded Apache 2, then get these 3 libraries
Modified: subversion/branches/cmake/subversion/libsvn_subr/sysinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/cmake/subversion/libsvn_subr/sysinfo.c?rev=1920507&r1=1920506&r2=1920507&view=diff
==============================================================================
--- subversion/branches/cmake/subversion/libsvn_subr/sysinfo.c (original)
+++ subversion/branches/cmake/subversion/libsvn_subr/sysinfo.c Sat Sep 7 11:11:59 2024
@@ -646,11 +646,16 @@ debian_release(apr_pool_t *pool)
static const char *
linux_release_name(apr_pool_t *pool)
{
- const char *uname_release = release_name_from_uname(pool);
+ const char *uname_release = NULL;
+ const char *release_name;
+
+#if HAVE_UNAME
+ uname_release = release_name_from_uname(pool);
+#endif
/* Try anything that has /usr/bin/lsb_release.
Covers, for example, Debian, Ubuntu and SuSE. */
- const char *release_name = lsb_release(pool);
+ release_name = lsb_release(pool);
/* Try the systemd way (covers Arch). */
if (!release_name)
Modified: subversion/branches/cmake/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/branches/cmake/subversion/svnlook/svnlook.c?rev=1920507&r1=1920506&r2=1920507&view=diff
==============================================================================
--- subversion/branches/cmake/subversion/svnlook/svnlook.c (original)
+++ subversion/branches/cmake/subversion/svnlook/svnlook.c Sat Sep 7 11:11:59 2024
@@ -363,7 +363,7 @@ struct svnlook_opt_state
const char *txn;
svn_boolean_t version; /* --version */
svn_boolean_t show_ids; /* --show-ids */
- apr_size_t limit; /* --limit */
+ int limit; /* --limit */
svn_boolean_t help; /* --help */
svn_boolean_t no_diff_deleted; /* --no-diff-deleted */
svn_boolean_t no_diff_added; /* --no-diff-added */
@@ -391,7 +391,7 @@ typedef struct svnlook_ctxt_t
svn_fs_t *fs;
svn_boolean_t is_revision;
svn_boolean_t show_ids;
- apr_size_t limit;
+ int limit;
svn_boolean_t no_diff_deleted;
svn_boolean_t no_diff_added;
svn_boolean_t diff_copy_from;
@@ -1579,7 +1579,7 @@ struct print_history_baton
{
svn_fs_t *fs;
svn_boolean_t show_ids; /* whether to show node IDs */
- apr_size_t limit; /* max number of history items */
+ int limit; /* max number of history items */
apr_size_t count; /* number of history items processed */
};
@@ -2582,11 +2582,12 @@ sub_main(int *exit_code, int argc, const
case 'l':
{
- char *end;
- opt_state.limit = strtol(opt_arg, &end, 10);
- if (end == opt_arg || *end != '\0')
+ const char *utf8_opt_arg;
+ SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool));
+ svn_error_t *err = svn_cstring_atoi(&opt_state.limit, utf8_opt_arg);
+ if (err)
{
- return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, err ,
_("Non-numeric limit argument given"));
}
if (opt_state.limit <= 0)
Modified: subversion/branches/cmake/subversion/svnserve/svnserve.c
URL: http://svn.apache.org/viewvc/subversion/branches/cmake/subversion/svnserve/svnserve.c?rev=1920507&r1=1920506&r2=1920507&view=diff
==============================================================================
--- subversion/branches/cmake/subversion/svnserve/svnserve.c (original)
+++ subversion/branches/cmake/subversion/svnserve/svnserve.c Sat Sep 7 11:11:59 2024
@@ -191,7 +191,7 @@ void winservice_notify_stop(void)
if (winservice_svnserve_accept_socket != INVALID_SOCKET)
closesocket(winservice_svnserve_accept_socket);
}
-#endif /* _WIN32 */
+#endif /* WIN32 */
/* Option codes and descriptions for svnserve.
Modified: subversion/branches/cmake/tools/dev/awk/buildwin.bat
URL: http://svn.apache.org/viewvc/subversion/branches/cmake/tools/dev/awk/buildwin.bat?rev=1920507&r1=1920506&r2=1920507&view=diff
==============================================================================
--- subversion/branches/cmake/tools/dev/awk/buildwin.bat (original)
+++ subversion/branches/cmake/tools/dev/awk/buildwin.bat Sat Sep 7 11:11:59 2024
@@ -5,6 +5,7 @@ rem
rem If you delete the call to setlocal it will probably work under Win95/Win98 as well.
setlocal
+cd %~dp0
set cl=/DHAS_ISBLANK -w -Ox -nologo -link -nologo setargv.obj
cl maketab.c /link /out:maketab.exe
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.