- 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.
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
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.
/* 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
* 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
}
/*
- 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)
#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)
<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>
<para><ulink url="http://www.ccp14.ac.uk/ccp14admin/rsync/"></ulink></para>
</appendix>
-</book>
\ No newline at end of file
+</book>
#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;
#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
**/
* 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
* Fix incorrect zpadlen handling in fmtfp.
* Thanks to Ollie Oldham <ollie.oldham@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@samba.org) April 2003
* Remove NO_CONFIG_H so that the test case can be built within a source
*
* 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)
*
* 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)
* 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.
{
#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.
* 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.
*/
* 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
/* 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;
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
/* 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
* 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.
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
* 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,
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.
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
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.
for p in "${@}"; do
(echo " makepath $p"
- # Absolut Unix.
+ # Absolute Unix path.
if echo $p | grep '^/' >/dev/null
then
cd /
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"
"$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
/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.
}
/*
- * 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
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;
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;
}
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--;
git.samba.org / rsync.git / commitdiff