[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Tue Apr 5 14:37:38 MDT 2011
The branch, master has been updated
via b223d96 Add some temp-name dot heuristics for OS X's sake.
from 28b519c Applying the preallocate patch.
;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b223d96bf0d040cfa445a45213fc517ab8389785
Author: Wayne Davison <wayned at samba.org>
Date: Tue Apr 5 13:35:13 2011 -0700
Add some temp-name dot heuristics for OS X's sake.
- Drop one leading '.' from the filename (before adding our own).
- Drop one trailing '.' from a (possibly truncated) name prior to
the .XXXXXX suffix being added.
- Allow the temp-name to collapse to just the .XXXXXX suffix
if the path is long enough to require that.
Note that we don't try to remove multiple dots from a filename
that actually has multiple consecutive dots, since we might as
well learn early if the final name is going to fail or not.
-----------------------------------------------------------------------
Summary of changes:
receiver.c | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/receiver.c b/receiver.c
index 4c43bc1..1819830 100644
--- a/receiver.c
+++ b/receiver.c
@@ -94,7 +94,7 @@ static int updating_basis_or_equiv;
* transfer is in progress. */
int get_tmpname(char *fnametmp, const char *fname, BOOL make_unique)
{
- int maxname, added, length = 0;
+ int maxname, length = 0;
const char *f;
char *suf;
@@ -113,6 +113,8 @@ int get_tmpname(char *fnametmp, const char *fname, BOOL make_unique)
}
} else
f = fname;
+ if (*f == '.') /* avoid an extra leading dot for OS X's sake */
+ f++;
fnametmp[length++] = '.';
/* The maxname value is bufsize, and includes space for the '\0'.
@@ -120,24 +122,30 @@ int get_tmpname(char *fnametmp, const char *fname, BOOL make_unique)
maxname = MIN(MAXPATHLEN - length - TMPNAME_SUFFIX_LEN,
NAME_MAX - 1 - TMPNAME_SUFFIX_LEN);
- if (maxname < 1) {
+ if (maxname < 0) {
rprintf(FERROR_XFER, "temporary filename too long: %s\n", fname);
fnametmp[0] = '\0';
return 0;
}
- added = strlcpy(fnametmp + length, f, maxname);
- if (added >= maxname)
- added = maxname - 1;
- suf = fnametmp + length + added;
-
- /* Trim any dangling high-bit chars if the first-trimmed char (if any) is
- * also a high-bit char, just in case we cut into a multi-byte sequence.
- * We are guaranteed to stop because of the leading '.' we added. */
- if ((int)f[added] & 0x80) {
- while ((int)suf[-1] & 0x80)
+ if (maxname) {
+ int added = strlcpy(fnametmp + length, f, maxname);
+ if (added >= maxname)
+ added = maxname - 1;
+ suf = fnametmp + length + added;
+
+ /* Trim any dangling high-bit chars if the first-trimmed char (if any) is
+ * also a high-bit char, just in case we cut into a multi-byte sequence.
+ * We are guaranteed to stop because of the leading '.' we added. */
+ if ((int)f[added] & 0x80) {
+ while ((int)suf[-1] & 0x80)
+ suf--;
+ }
+ /* trim one trailing dot before our suffix's dot */
+ if (suf[-1] == '.')
suf--;
- }
+ } else
+ suf = fnametmp + length - 1; /* overwrite the leading dot with suffix's dot */
if (make_unique) {
static unsigned counter_limit;
--
The rsync repository.
More information about the rsync-cvs
mailing list