The branch, master has been updated via ead44adc Allow the generator's msg iobuf to get bigger too. via d3085f7a Rename util.c to util1.c via 1da64c37 A few Cygwin build tweaks. [buildall] from ef36b097 Stop checking for gmake in build scripts
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit ead44adcd3eea08bfff2ba835943317706b76a73 Author: Wayne Davison <wa...@opencoder.net> Date: Thu Feb 25 12:28:18 2021 -0800 Allow the generator's msg iobuf to get bigger too. commit d3085f7add38a5cf833a0b31cb0637ff46c80f8d Author: Wayne Davison <wa...@opencoder.net> Date: Thu Feb 25 09:13:52 2021 -0800 Rename util.c to util1.c Fixes an issue where the Makefile's glob of *.c could sort util.c & util2.c in an order that depends on the current collation setting. commit 1da64c37e85e08c73e73debc8f49af0b0cca6a51 Author: Wayne Davison <wa...@opencoder.net> Date: Wed Feb 10 08:06:47 2021 -0800 A few Cygwin build tweaks. [buildall] ----------------------------------------------------------------------- Summary of changes: .github/workflows/build.yml | 6 +++--- INSTALL.md | 2 +- Makefile.in | 4 ++-- io.c | 4 ++-- packaging/var-checker | 2 +- util.c => util1.c | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename util.c => util1.c (100%) Changeset truncated at 500 lines: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8074c311..8f4d1070 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,11 +91,11 @@ jobs: args: install -y --no-progress cygwin cyg-get - name: prep run: | - cyg-get make autoconf automake gcc-core attr libattr-devel python3 python38-pip libzstd-devel liblz4-devel libssl-devel libxxhash0 libxxhash-devel + cyg-get make autoconf automake gcc-core attr libattr-devel python38 python38-pip libzstd-devel liblz4-devel libssl-devel libxxhash0 libxxhash-devel curl.exe -o git-version.h https://download.samba.org/pub/rsync/generated-files/git-version.h echo "C:/tools/cygwin/bin" >>$Env:GITHUB_PATH - - name: pip3 - run: bash -c 'pip3 install --user commonmark' + - name: commonmark + run: bash -c 'python3 -mpip install --user commonmark' - name: configure run: bash -c './configure' - name: make diff --git a/INSTALL.md b/INSTALL.md index fbf35c06..1f373c69 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -142,7 +142,7 @@ like. - For Cygwin (with all cygwin programs stopped, run the appropriate setup program from a cmd shell): - > setup-x86_64 --quiet-mode -P make,gawk,autoconf,automake,gcc-core,python3,python38-pip + > setup-x86_64 --quiet-mode -P make,gawk,autoconf,automake,gcc-core,python38,python38-pip > setup-x86_64 --quiet-mode -P attr,libattr-devel > setup-x86_64 --quiet-mode -P libzstd-devel > setup-x86_64 --quiet-mode -P liblz4-devel diff --git a/Makefile.in b/Makefile.in index 7f6fc7bf..67190489 100644 --- a/Makefile.in +++ b/Makefile.in @@ -41,7 +41,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \ zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \ zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \ - util.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o + util1.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \ usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o OBJS3=progress.o pipe.o @ASM@ @@ -159,7 +159,7 @@ TRIMSLASH_OBJ = trimslash.o syscall.o t_stub.o lib/compat.o lib/snprintf.o trimslash$(EXEEXT): $(TRIMSLASH_OBJ) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS) -T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o +T_UNSAFE_OBJ = t_unsafe.o syscall.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS) diff --git a/io.c b/io.c index b50a066c..cc70ce88 100644 --- a/io.c +++ b/io.c @@ -962,9 +962,9 @@ int send_msg(enum msgcode code, const char *buf, size_t len, int convert) #endif needed = len + 4 + 3; if (iobuf.msg.len + needed > iobuf.msg.size) { - if (!am_receiver) + if (am_sender) perform_io(needed, PIO_NEED_MSGROOM); - else { /* We allow the receiver to increase their iobuf.msg size to avoid a deadlock. */ + else { /* We sometimes allow the iobuf.msg size to increase to avoid a deadlock. */ size_t old_size = iobuf.msg.size; restore_iobuf_size(&iobuf.msg); realloc_xbuf(&iobuf.msg, iobuf.msg.size * 2); diff --git a/packaging/var-checker b/packaging/var-checker index fe7491df..11f99ef0 100755 --- a/packaging/var-checker +++ b/packaging/var-checker @@ -16,7 +16,7 @@ def main(): add_util_c = set('t_stub.c t_unsafe.c'.split()) syscall_c = slurp_file('syscall.c', True) - util_c = slurp_file('util.c', True) + util_c = slurp_file('util1.c', True) for fn in sorted(glob.glob('*.c')): txt = slurp_file(fn) diff --git a/util.c b/util1.c similarity index 100% rename from util.c rename to util1.c -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs