The branch, master has been updated
via 020eda88 Change fetch depth.
via b5f8021a Don't use --always to ensure a tag is in gitver.
via 7b694757 Avoid a build fail when git isn't installed.
via 9375a8c4 Make my_alloc(NULL) use malloc instead of calloc.
via 7f5c4084 Use touch for proto.h-tstamp since one awk wasn't updating
mtime.
via 6c89f00d Move SUPPORT_ATIMES to rsync.h.
from dee09932 Create usage.c for smaller awk-dep rebuilds.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 020eda887f91741c45b9bbb5bd54749798829c58
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Aug 3 14:47:38 2020 -0700
Change fetch depth.
commit b5f8021a123f95bcd84e04b235ed9c3d5428eb76
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Aug 3 14:25:43 2020 -0700
Don't use --always to ensure a tag is in gitver.
commit 7b6947576a44626800e06df2c51374894fb74e61
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Aug 3 14:19:13 2020 -0700
Avoid a build fail when git isn't installed.
commit 9375a8c4c2b79a9d44ceae00de7284b77d79033c
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Aug 3 14:01:18 2020 -0700
Make my_alloc(NULL) use malloc instead of calloc.
commit 7f5c4084c76f2fe70618c0a963e52e0bd36d40df
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Aug 3 13:31:56 2020 -0700
Use touch for proto.h-tstamp since one awk wasn't updating mtime.
commit 6c89f00d1bc2b367c8385e3b423007569a83f228
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Aug 3 13:27:00 2020 -0700
Move SUPPORT_ATIMES to rsync.h.
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/build.yml | 2 ++
ifuncs.h | 2 +-
mkgitver | 5 +++--
mkproto.awk | 2 +-
options.c | 4 ----
rsync.h | 14 +++++++++-----
util2.c | 6 +++---
7 files changed, 19 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e1d63d99..ce5eedf0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,8 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
- name: prep
run: |
sudo apt-get install acl libacl1-dev attr libattr1-dev liblz4-dev
libzstd-dev libxxhash-dev python3-cmarkgfm openssl
diff --git a/ifuncs.h b/ifuncs.h
index b9490588..4037639b 100644
--- a/ifuncs.h
+++ b/ifuncs.h
@@ -105,7 +105,7 @@ free_stat_x(stat_x *sx_p)
static inline char *my_strdup(const char *str, const char *file, int line)
{
int len = strlen(str)+1;
- char *buf = my_alloc(do_malloc, len, 1, file, line);
+ char *buf = my_alloc(NULL, len, 1, file, line);
memcpy(buf, str, len);
return buf;
}
diff --git a/mkgitver b/mkgitver
index 309beda7..c0dd1b5f 100755
--- a/mkgitver
+++ b/mkgitver
@@ -1,9 +1,10 @@
#!/bin/sh
srcdir=`dirname $0`
+gitver=`git describe --abbrev=8 2>/dev/null`
-if test -e "$srcdir/.git"; then
- gitver=\"`git describe --abbrev=8 --always`\" || exit 1
+if test x"$gitver" != x; then
+ gitver=\""$gitver"\"
else
gitver=RSYNC_VERSION
fi
diff --git a/mkproto.awk b/mkproto.awk
index a64d132e..bd2e927b 100644
--- a/mkproto.awk
+++ b/mkproto.awk
@@ -36,5 +36,5 @@ inheader {
END {
if (old_protos != protos) print protos > "proto.h"
- printf "" > "proto.h-tstamp"
+ system("touch proto.h-tstamp")
}
diff --git a/options.c b/options.c
index 1857f70a..a9f0dc9e 100644
--- a/options.c
+++ b/options.c
@@ -192,10 +192,6 @@ const char **remote_options = NULL;
const char *checksum_choice = NULL;
const char *compress_choice = NULL;
-#ifndef __APPLE__ /* Do we need a configure check for this? */
-#define SUPPORT_ATIMES 1
-#endif
-
int quiet = 0;
int output_motd = 1;
int log_before_transfer = 0;
diff --git a/rsync.h b/rsync.h
index b8bdd786..0f5304ee 100644
--- a/rsync.h
+++ b/rsync.h
@@ -570,6 +570,10 @@ typedef unsigned int size_t;
#endif
#endif
+#ifndef __APPLE__ /* Do we need a configure check for this? */
+#define SUPPORT_ATIMES 1
+#endif
+
#ifdef HAVE_GETATTRLIST
#define SUPPORT_CRTIMES 1
#endif
@@ -1320,15 +1324,15 @@ extern int errno;
/* handler for null strings in printf format */
#define NS(s) ((s)?(s):"<NULL>")
-extern char *do_malloc;
+extern char *do_calloc;
/* Convenient wrappers for malloc and realloc. Use them. */
-#define new(type) ((type*)my_alloc(do_malloc, sizeof (type), 1, __FILE__,
__LINE__))
-#define new0(type) ((type*)my_alloc(NULL, sizeof (type), 1, __FILE__,
__LINE__))
+#define new(type) ((type*)my_alloc(NULL, sizeof (type), 1, __FILE__, __LINE__))
+#define new0(type) ((type*)my_alloc(do_calloc, sizeof (type), 1, __FILE__,
__LINE__))
#define realloc_buf(ptr, num) my_alloc((ptr), (num), 1, __FILE__, __LINE__)
-#define new_array(type, num) ((type*)my_alloc(do_malloc, (num), sizeof (type),
__FILE__, __LINE__))
-#define new_array0(type, num) ((type*)my_alloc(NULL, (num), sizeof (type),
__FILE__, __LINE__))
+#define new_array(type, num) ((type*)my_alloc(NULL, (num), sizeof (type),
__FILE__, __LINE__))
+#define new_array0(type, num) ((type*)my_alloc(do_calloc, (num), sizeof
(type), __FILE__, __LINE__))
#define realloc_array(ptr, type, num) ((type*)my_alloc((ptr), (num), sizeof
(type), __FILE__, __LINE__))
#undef strdup
diff --git a/util2.c b/util2.c
index 8b61d0b5..a8609a5d 100644
--- a/util2.c
+++ b/util2.c
@@ -26,7 +26,7 @@
extern size_t max_alloc;
-char *do_malloc = "42";
+char *do_calloc = "42";
/**
* Sleep for a specified number of milliseconds.
@@ -80,9 +80,9 @@ void *my_alloc(void *ptr, size_t num, size_t size, const char
*file, int line)
exit_cleanup(RERR_MALLOC);
}
if (!ptr)
- ptr = calloc(num, size);
- else if (ptr == do_malloc)
ptr = malloc(num * size);
+ else if (ptr == do_calloc)
+ ptr = calloc(num, size);
else
ptr = realloc(ptr, num * size);
if (!ptr && file)
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
