[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Thu Apr 16 00:45:34 UTC 2020
The branch, master has been updated
via d2970213 Spelling fixes from a Fossies run done by Jens.
from 1c82a1e1 A few file-data improvements.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d29702134ab9e508e88d789a1cefeed2dbb221ec
Author: Wayne Davison <wayne at opencoder.net>
Date: Wed Apr 15 17:42:23 2020 -0700
Spelling fixes from a Fossies run done by Jens.
-----------------------------------------------------------------------
Summary of changes:
OLDNEWS | 2 +-
TODO | 4 ++--
acls.c | 2 +-
case_N.h | 2 +-
checksum.c | 2 +-
chmod.c | 2 +-
doc/rsync.sgml | 4 ++--
fileio.c | 8 ++++----
lib/compat.c | 2 +-
lib/snprintf.c | 4 ++--
lib/sysacls.c | 10 +++++-----
loadparm.c | 4 ++--
options.c | 2 +-
params.c | 6 +++---
rsync.c | 2 +-
rsync.yo | 6 +++---
testsuite/rsync.fns | 2 +-
testsuite/ssh-basic.test | 2 +-
testsuite/trimslash.test | 4 ++--
token.c | 2 +-
uidlist.c | 2 +-
util.c | 2 +-
xattrs.c | 2 +-
23 files changed, 39 insertions(+), 39 deletions(-)
Changeset truncated at 500 lines:
diff --git a/OLDNEWS b/OLDNEWS
index de195420..084c3d48 100644
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -1265,7 +1265,7 @@ Changes since 2.6.9:
- Ensure that a temporary file always has owner-write permission while we
are writing to it. This avoids problems with some network filesystems
- when transfering read-only files.
+ when transferring read-only files.
- Any errors output about password-file reading no longer cause an error at
the end of the run about a partial transfer.
diff --git a/TODO b/TODO
index 9baf4631..03ecfeaf 100644
--- a/TODO
+++ b/TODO
@@ -94,7 +94,7 @@ Handling IPv6 on old machines
platforms that have a half-working implementation, so redefining
these functions clashes with system headers, and leaving them out
breaks. This affects at least OSF/1, RedHat 5, and Cobalt, which
- are moderately improtant.
+ are moderately important.
Perhaps the simplest solution would be to have two different files
implementing the same interface, and choose either the new or the
@@ -236,7 +236,7 @@ Memory accounting
At exit, show how much memory was used for the file list, etc.
- Also we do a wierd exponential-growth allocation in flist.c. I'm
+ We also do a weird exponential-growth allocation in flist.c. I'm
not sure this makes sense with modern mallocs. At any rate it will
make us allocate a huge amount of memory for large file lists.
diff --git a/acls.c b/acls.c
index 264b920b..2bc2e4e1 100644
--- a/acls.c
+++ b/acls.c
@@ -48,7 +48,7 @@ extern int preserve_specials;
/* When we send the access bits over the wire, we shift them 2 bits to the
* left and use the lower 2 bits as flags (relevant only to a name entry).
* This makes the protocol more efficient than sending a value that would
- * be likely to have its hightest bits set. */
+ * be likely to have its highest bits set. */
#define XFLAG_NAME_FOLLOWS 0x0001u
#define XFLAG_NAME_IS_USER 0x0002u
diff --git a/case_N.h b/case_N.h
index 68727ab9..97acf6e6 100644
--- a/case_N.h
+++ b/case_N.h
@@ -17,7 +17,7 @@
* with this program; if not, visit the http://fsf.org website.
*/
-/* This is included multiple times, once for every segement in a switch statement.
+/* This is included multiple times, once for every segment in a switch statement.
* This produces the next "case N:" statement in sequence. */
#if !defined CASE_N_STATE_0
diff --git a/checksum.c b/checksum.c
index a6f1cd9c..cd234038 100644
--- a/checksum.c
+++ b/checksum.c
@@ -100,7 +100,7 @@ int canonical_checksum(int csum_type)
}
/*
- a simple 32 bit checksum that can be upadted from either end
+ a simple 32 bit checksum that can be updated from either end
(inspired by Mark Adler's Adler-32 checksum)
*/
uint32 get_checksum1(char *buf1, int32 len)
diff --git a/chmod.c b/chmod.c
index 43eb9b94..ffb345c9 100644
--- a/chmod.c
+++ b/chmod.c
@@ -44,7 +44,7 @@ struct chmod_mode_struct {
#define STATE_OCTAL_NUM 3
/* Parse a chmod-style argument, and break it down into one or more AND/OR
- * pairs in a linked list. We return a pointer to new items on succcess
+ * pairs in a linked list. We return a pointer to new items on success
* (appending the items to the specified list), or NULL on error. */
struct chmod_mode_struct *parse_chmod(const char *modestr,
struct chmod_mode_struct **root_mode_ptr)
diff --git a/doc/rsync.sgml b/doc/rsync.sgml
index 76a50c26..0f900590 100644
--- a/doc/rsync.sgml
+++ b/doc/rsync.sgml
@@ -126,7 +126,7 @@
<para><option>-P</option>
Display a progress indicator while files are transferred. This should
- normally be ommitted if rsync is not run on a terminal.
+ normally be omitted if rsync is not run on a terminal.
</para>
</section>
@@ -348,4 +348,4 @@ running rsync giving the network directory.
<para><ulink url="http://www.ccp14.ac.uk/ccp14admin/rsync/"></ulink></para>
</appendix>
-</book>
\ No newline at end of file
+</book>
diff --git a/fileio.c b/fileio.c
index 0f73ba43..c6e12202 100644
--- a/fileio.c
+++ b/fileio.c
@@ -26,12 +26,12 @@
#define ENODATA EAGAIN
#endif
-/* We want all reads to be aligned on 1K boundries. */
-#define ALIGN_BOUNDRY 1024
+/* We want all reads to be aligned on 1K boundaries. */
+#define ALIGN_BOUNDARY 1024
/* How far past the boundary is an offset? */
-#define ALIGNED_OVERSHOOT(oft) ((oft) & (ALIGN_BOUNDRY-1))
+#define ALIGNED_OVERSHOOT(oft) ((oft) & (ALIGN_BOUNDARY-1))
/* Round up a length to the next boundary */
-#define ALIGNED_LENGTH(len) ((((len) - 1) | (ALIGN_BOUNDRY-1)) + 1)
+#define ALIGNED_LENGTH(len) ((((len) - 1) | (ALIGN_BOUNDARY-1)) + 1)
extern int sparse_files;
diff --git a/lib/compat.c b/lib/compat.c
index a62c8790..c1546744 100644
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -79,7 +79,7 @@ static char number_separator;
#ifndef HAVE_STRPBRK
/**
- * Find the first ocurrence in @p s of any character in @p accept.
+ * Find the first occurrence in @p s of any character in @p accept.
*
* Derived from glibc
**/
diff --git a/lib/snprintf.c b/lib/snprintf.c
index c17868f0..52fdd11f 100644
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@@ -34,7 +34,7 @@
* probably requires libm on most operating systems. Don't yet
* support the exponent (e,E) and sigfig (g,G). Also, fmtint()
* was pretty badly broken, it just wasn't being exercised in ways
- * which showed it, so that's been fixed. Also, formated the code
+ * which showed it, so that's been fixed. Also, formatted the code
* to mutt conventions, and removed dead code left over from the
* original. Also, there is now a builtin-test, just compile with:
* gcc -I.. -DTEST_SNPRINTF -o snprintf snprintf.c -lm
@@ -77,7 +77,7 @@
* Fix incorrect zpadlen handling in fmtfp.
* Thanks to Ollie Oldham <ollie.oldham at metro-optix.com> for spotting it.
* few mods to make it easier to compile the tests.
- * addedd the "Ollie" test to the floating point ones.
+ * added the "Ollie" test to the floating point ones.
*
* Martin Pool (mbp at samba.org) April 2003
* Remove NO_CONFIG_H so that the test case can be built within a source
diff --git a/lib/sysacls.c b/lib/sysacls.c
index 510030fa..e81b0e18 100644
--- a/lib/sysacls.c
+++ b/lib/sysacls.c
@@ -450,7 +450,7 @@ SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
*
* Note: we assume that the acl() system call returned a
* well formed ACL which is sorted so that all of the
- * access ACL entries preceed any default ACL entries
+ * access ACL entries precede any default ACL entries
*/
for (naccess = 0; naccess < count; naccess++) {
if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
@@ -932,7 +932,7 @@ SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
*
* Note: we assume that the acl() system call returned a
* well formed ACL which is sorted so that all of the
- * access ACL entries preceed any default ACL entries
+ * access ACL entries precede any default ACL entries
*/
for (naccess = 0; naccess < count; naccess++) {
if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
@@ -1095,7 +1095,7 @@ struct hpux_acl_types {
* structures.
* Inputs:
*
- * acl_count - Count of ACLs in the array of ACL strucutres.
+ * acl_count - Count of ACLs in the array of ACL structures.
* aclp - Array of ACL structures.
* acl_type_count - Pointer to acl_types structure. Should already be
* allocated.
@@ -1256,7 +1256,7 @@ static int hpux_acl_sort(int acl_count, int calclass, struct acl *aclp)
{
#if !defined(HAVE_HPUX_ACLSORT)
/*
- * The aclsort() system call is availabe on the latest HPUX General
+ * The aclsort() system call is available on the latest HPUX General
* Patch Bundles. So for HPUX, we developed our version of acl_sort
* function. Because, we don't want to update to a new
* HPUX GR bundle just for aclsort() call.
@@ -1311,7 +1311,7 @@ or DEF_USER_OBJ or DEF_GROUP_OBJ or DEF_OTHER_OBJ\n"));
* Sorting crieteria - First sort by ACL type. If there are multiple entries of
* same ACL type, sort by ACL id.
*
- * I am using the trival kind of sorting method here because, performance isn't
+ * I am using the trivial kind of sorting method here because, performance isn't
* really effected by the ACLs feature. More over there aren't going to be more
* than 17 entries on HPUX.
*/
diff --git a/loadparm.c b/loadparm.c
index eaa15d7d..8117fb35 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -30,7 +30,7 @@
* 1) add it to the global_vars or local_vars structure definition
* 2) add it to the parm_table
* 3) add it to the list of available functions (eg: using FN_GLOBAL_STRING())
- * 4) initialise it in the Defaults static stucture
+ * 4) initialise it in the Defaults static structure
*
* Notes:
* The configuration file is processed sequentially for speed. For this
@@ -115,7 +115,7 @@ typedef struct {
/* This structure describes a single section. Their order must match the
* initializers below, which you can accomplish by keeping each sub-section
* sorted. (e.g. in vim, just visually select each subsection and use !sort.)
- * NOTE: the char* variables MUST all remain at the start of the stuct! */
+ * NOTE: the char* variables MUST all remain at the start of the struct! */
typedef struct {
char *auth_users;
char *charset;
diff --git a/options.c b/options.c
index 4ec8d4c8..d567d649 100644
--- a/options.c
+++ b/options.c
@@ -2912,7 +2912,7 @@ static char *parse_hostspec(char *str, char **path_start_ptr, int *port_ptr)
return ret;
}
-/* Look for a HOST specfication of the form "HOST:PATH", "HOST::PATH", or
+/* Look for a HOST specification of the form "HOST:PATH", "HOST::PATH", or
* "rsync://HOST:PORT/PATH". If found, *host_ptr will be set to some allocated
* memory with the HOST. If a daemon-accessing spec was specified, the value
* of *port_ptr will contain a non-0 port number, otherwise it will be set to
diff --git a/params.c b/params.c
index 0fbd9863..910ef233 100644
--- a/params.c
+++ b/params.c
@@ -1,5 +1,5 @@
/* This modules is based on the params.c module from Samba, written by Karl Auer
- and much modifed by Christopher Hertel. */
+ and much modified by Christopher Hertel. */
/*
* This program is free software; you can redistribute it and/or modify
@@ -59,7 +59,7 @@
* beginning with either a semicolon (';') or a pound sign ('#').
*
* All whitespace in section names and parameter names is compressed
- * to single spaces. Leading and trailing whitespace is stipped from
+ * to single spaces. Leading and trailing whitespace is stripped from
* both names and values.
*
* Only the first equals sign in a parameter line is significant.
@@ -153,7 +153,7 @@ static int EatComment( FILE *InFile )
static int Continuation( char *line, int pos )
/* ------------------------------------------------------------------------ **
- * Scan backards within a string to discover if the last non-whitespace
+ * Scan backwards within a string to discover if the last non-whitespace
* character is a line-continuation character ('\\').
*
* Input: line - A pointer to a buffer containing the string to be
diff --git a/rsync.c b/rsync.c
index 4659d123..9479f24c 100644
--- a/rsync.c
+++ b/rsync.c
@@ -650,7 +650,7 @@ void sig_int(int sig_num)
* attributes (e.g. permissions, ownership, etc.). If the robust_rename()
* call is forced to copy the temp file and partialptr is both non-NULL and
* not an absolute path, we stage the file into the partial-dir and then
- * rename it into place. This returns 1 on succcess or 0 on failure. */
+ * rename it into place. This returns 1 on success or 0 on failure. */
int finish_transfer(const char *fname, const char *fnametmp,
const char *fnamecmp, const char *partialptr,
struct file_struct *file, int ok_to_set_time,
diff --git a/rsync.yo b/rsync.yo
index bcb33a79..8cc3e0a7 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -238,7 +238,7 @@ The command specified above uses ssh to run nc (netcat) on a proxyhost,
which forwards all data to port 873 (the rsync daemon) on the targethost
(%H).
-Note also that if the RSYNC_SHELL environment varibable is set, that
+Note also that if the RSYNC_SHELL environment variable is set, that
program will be used to run the RSYNC_CONNECT_PROG command instead of
using the default shell of the code(system()) call.
@@ -1348,7 +1348,7 @@ destination machines is higher than the bandwidth to disk (especially when the
the source and destination are specified as local paths, but only if no
batch-writing option is in effect.
-dit(bf(--checksum-choice=STR)) This option overrides the checksum algoriths.
+dit(bf(--checksum-choice=STR)) This option overrides the checksum algorithms.
If one algorithm name is specified, it is used for both the transfer checksums
and (assuming bf(--checksum) is specified) the pre-transfer checksumming. If two
comma-separated names are supplied, the first name affects the transfer
@@ -1654,7 +1654,7 @@ rsync to have a different idea about what data to expect next over the socket,
and that will make it fail in a cryptic fashion.
Note that it is best to use a separate bf(--remote-option) for each option you
-want to pass. This makes your useage compatible with the bf(--protect-args)
+want to pass. This makes your usage compatible with the bf(--protect-args)
option. If that option is off, any spaces in your remote options will be split
by the remote shell unless you take steps to protect them.
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index ca05297f..bd5768b9 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -183,7 +183,7 @@ makepath() {
for p in "${@}"; do
(echo " makepath $p"
- # Absolut Unix.
+ # Absolute Unix path.
if echo $p | grep '^/' >/dev/null
then
cd /
diff --git a/testsuite/ssh-basic.test b/testsuite/ssh-basic.test
index c91505b8..4bcbdfe9 100644
--- a/testsuite/ssh-basic.test
+++ b/testsuite/ssh-basic.test
@@ -19,7 +19,7 @@ if test x"$rsync_enable_ssh_tests" = xyes; then
fi
if [ "`$SSH -o'BatchMode yes' localhost echo yes`" != "yes" ]; then
- test_skipped "Skipping SSH tests because ssh conection to localhost not authorised"
+ test_skipped "Skipping SSH tests because ssh connection to localhost not authorised"
fi
echo "Using remote shell: $SSH"
diff --git a/testsuite/trimslash.test b/testsuite/trimslash.test
index d98ff87b..ec551e65 100644
--- a/testsuite/trimslash.test
+++ b/testsuite/trimslash.test
@@ -11,7 +11,7 @@
"$TOOLDIR/trimslash" "/usr/local/bin" "/usr/local/bin/" "/usr/local/bin///" \
"//a//" "////" \
- "/Users/Wierd Macintosh Name/// Ooh, translucent plastic/" \
+ "/Users/Weird Macintosh Name/// Ooh, translucent plastic/" \
> "$scratchdir/slash.out"
diff $diffopt "$scratchdir/slash.out" - <<EOF
/usr/local/bin
@@ -19,7 +19,7 @@ diff $diffopt "$scratchdir/slash.out" - <<EOF
/usr/local/bin
//a
/
-/Users/Wierd Macintosh Name/// Ooh, translucent plastic
+/Users/Weird Macintosh Name/// Ooh, translucent plastic
EOF
# The script would have aborted on error, so getting here means we've won.
diff --git a/token.c b/token.c
index 0a5ed735..6e08dc0a 100644
--- a/token.c
+++ b/token.c
@@ -639,7 +639,7 @@ void send_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
}
/*
- * receive a token or buffer from the other end. If the reurn value is >0 then
+ * receive a token or buffer from the other end. If the return value is >0 then
* it is a data buffer of that length, and *data will point at the data.
* if the return value is -i then it represents token i-1
* if the return value is 0 then the end has been reached
diff --git a/uidlist.c b/uidlist.c
index e0c0d74b..8bfeea27 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -252,7 +252,7 @@ static struct idlist *recv_add_id(struct idlist **idlist_ptr, struct idlist *idm
return node;
}
-/* this function is a definate candidate for a faster algorithm */
+/* this function is a definite candidate for a faster algorithm */
uid_t match_uid(uid_t uid)
{
static struct idlist *last = NULL;
diff --git a/util.c b/util.c
index ec80b43b..c5569f6d 100644
--- a/util.c
+++ b/util.c
@@ -1459,7 +1459,7 @@ const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr)
if (!isDigit(s))
return suf;
}
- /* An all-digit suffix may not be that signficant. */
+ /* An all-digit suffix may not be that significant. */
s = suf;
}
diff --git a/xattrs.c b/xattrs.c
index b5519186..34ff51cb 100644
--- a/xattrs.c
+++ b/xattrs.c
@@ -719,7 +719,7 @@ int recv_xattr_request(struct file_struct *file, int f_in)
num += rel_pos;
if (am_sender) {
/* The sender-related num values are only in order on the sender.
- * We use that order here to scan foward or backward as needed. */
+ * We use that order here to scan forward or backward as needed. */
if (rel_pos < 0) {
while (cnt < (int)lst->count && rxa->num > num) {
rxa--;
--
The rsync repository.
More information about the rsync-cvs
mailing list