Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ PREDEFINED =
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
# Configuration::addtions related to external references
# Configuration::additions related to external references
#---------------------------------------------------------------------------
TAGFILES =
GENERATE_TAGFILE =
Expand All @@ -176,7 +176,7 @@ MAX_DOT_GRAPH_HEIGHT = 1024
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
# Configuration::addtions related to the search engine
# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO
CGI_NAME = search.cgi
Expand Down
2 changes: 1 addition & 1 deletion generator.c
Original file line number Diff line number Diff line change
Expand Up @@ -1848,7 +1848,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR)
goto cleanup;
if (am_root < 0) {
/* For --fake-super, the dir must be useable by the copying
/* For --fake-super, the dir must be usable by the copying
* user, just like it would be for root. */
added_perms = S_IRUSR|S_IWUSR|S_IXUSR;
} else
Expand Down
6 changes: 3 additions & 3 deletions popt/README
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
This is the popt command line option parsing library. While it is similiar
This is the popt command line option parsing library. While it is similar
to getopt(3), it contains a number of enhancements, including:

1) popt is fully reentrant
2) popt can parse arbitrary argv[] style arrays while
getopt(2) makes this quite difficult
3) popt allows users to alias command line arguments
4) popt provides convience functions for parsing strings
4) popt provides convenience functions for parsing strings
into argv[] style arrays

popt is used by rpm, the Red Hat install program, and many other Red Hat
utilities, all of which provide excellent examples of how to use popt.
Complete documentation on popt is available in popt.ps (included in this
tarball), which is excerpted with permission from the book "Linux
Application Development" by Michael K. Johnson and Erik Troan (availble
Application Development" by Michael K. Johnson and Erik Troan (available
from Addison Wesley in May, 1998).

Comments on popt should be addressed to ewt@redhat.com.
2 changes: 1 addition & 1 deletion popt/popt.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static void invokeCallbacksOPTION(poptContext con,
{ const void *cbData = (cbopt->descrip ? cbopt->descrip : myData);
cbarg.cb(con, POPT_CALLBACK_REASON_OPTION,
myOpt, con->os->nextArg, cbData);
/* Terminate (unless explcitly continuing). */
/* Terminate (unless explicitly continuing). */
if (!CBF_ISSET(cbopt, CONTINUE))
return;
}
Expand Down
8 changes: 4 additions & 4 deletions popt/popt.h
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ int poptSaveString(const char *** argvp, unsigned int argInfo,

/**
* Save a long long, performing logical operation with value.
* @warning Alignment check may be too strict on certain platorms.
* @warning Alignment check may be too strict on certain platforms.
* @param arg integer pointer, aligned on int boundary.
* @param argInfo logical operation (see POPT_ARGFLAG_*)
* @param aLongLong value to use
Expand All @@ -515,7 +515,7 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo,

/**
* Save a long, performing logical operation with value.
* @warning Alignment check may be too strict on certain platorms.
* @warning Alignment check may be too strict on certain platforms.
* @param arg integer pointer, aligned on int boundary.
* @param argInfo logical operation (see POPT_ARGFLAG_*)
* @param aLong value to use
Expand All @@ -525,7 +525,7 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong);

/**
* Save a short integer, performing logical operation with value.
* @warning Alignment check may be too strict on certain platorms.
* @warning Alignment check may be too strict on certain platforms.
* @param arg short pointer, aligned on short boundary.
* @param argInfo logical operation (see POPT_ARGFLAG_*)
* @param aLong value to use
Expand All @@ -535,7 +535,7 @@ int poptSaveShort(short * arg, unsigned int argInfo, long aLong);

/**
* Save an integer, performing logical operation with value.
* @warning Alignment check may be too strict on certain platorms.
* @warning Alignment check may be too strict on certain platforms.
* @param arg integer pointer, aligned on int boundary.
* @param argInfo logical operation (see POPT_ARGFLAG_*)
* @param aLong value to use
Expand Down
2 changes: 1 addition & 1 deletion receiver.c
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
return -1;

if (am_root < 0) {
/* For --fake-super, the file must be useable by the copying
/* For --fake-super, the file must be usable by the copying
* user, just like it would be for root. */
added_perms = S_IRUSR|S_IWUSR;
} else {
Expand Down
2 changes: 1 addition & 1 deletion rsync-web/FAQ.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h3><a name=2>rsync recopies the same files</a></h3>
UTC. For a full explanation of this and some suggestions on how to
avoid them problem, see <a href="daylight-savings.html">this document</a>.

<p>Something else that can trip up rsync is a filesystem changeing the
<p>Something else that can trip up rsync is a filesystem changing the
filename behind the scenes. This can happen when a filesystem changes
an all-uppercase name into lowercase, or when it decomposes UTF-8 behind
your back.
Expand Down
2 changes: 1 addition & 1 deletion rsync-web/daylight-savings.html
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ <h2>Notes and References</h2>
<a href="http://support.microsoft.com/default.aspx?scid=kb;[LN];158588">http://support.microsoft.com/default.aspx?scid=kb;[LN];158588</a>

<p>
I wish to thank Wayne Piekarski for having copiled the
I wish to thank Wayne Piekarski for having compiled the
references and also supplying some additional insights.

<p>
Expand Down
2 changes: 1 addition & 1 deletion rsync-web/firewall.html
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ <h4>Method 4 -- for using rsync in daemon-mode (requires nc)</h4>

<p>This command takes advantage of the RSYNC_CONNECT_PROG environment
variable, which tells rsync to pipe its socket data to an external program
in place of making a direct socket connection. The command specifed above
in place of making a direct socket connection. The command specified above
uses ssh to run the nc (netcat) command on the middle host, which forwards
all socket data to port 873 on the target host (%H). The "%H" will be
substituted with the target host from the rsync command as long as you're
Expand Down
2 changes: 1 addition & 1 deletion rsync-web/issues.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <H2 align="center">current issues and debugging</H2>
for you: stop it. If you need more info on what rsync is changing, using the
<code>--itemize-changes</code> option (<code>-i</code>) and repeat it if you
need to see unchanged files. This is a much better way to go that doesn't fill
up the communication pipeline with a large quanity of debug messages.
up the communication pipeline with a large quantity of debug messages.

<p>See the "rsync-debug" script below for an example of how to grab strace
information from the remote rsync process(es). If you need help, send email to
Expand Down
2 changes: 1 addition & 1 deletion rsync-web/lists.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <H2 align="center">rsync mailing lists</H2>

<li>
<b>rsync-announce</b> carries only messages from the
maintainer annoucing new releases, which happen at most a few
maintainer announcing new releases, which happen at most a few
times per month.

[<a href="https://www.mail-archive.com/rsync-announce@lists.samba.org/">archive 1</a>,
Expand Down
2 changes: 1 addition & 1 deletion rsync-web/nt.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <H2 align="center">rsync on NT</H2>
Don't do this unless you are comfortable with the changes! Run regedit32 and
add the following keys and values (quotation marks ARE IMPORTANT):
HKEY_LOCAL_MACHINE->SYSTEM->CurrentControlSet->Services->Rsync
Edit->Add Key-> Key Name: Paramaters
Edit->Add Key-> Key Name: Parameters
Edit->Add Value-> Value Name: AppDirectory Value: "C:\programfiles\rsync"
Edit->Add Value-> Value Name: Application Value: "C:\programfiles\rsync\rsync.exe"
Edit->Add Value-> Value Name: AppParamters Value: --config="C:\programfiles\rsync\rsyncd.conf" --daemon
Expand Down
2 changes: 1 addition & 1 deletion rsync-web/nt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The first two lines are important for rsync to work on Windows NT however.
Don't do this unless you are comfortable with the changes! Run regedit32 and
add the following keys and values (quotation marks ARE IMPORTANT):
HKEY_LOCAL_MACHINE->SYSTEM->CurrentControlSet->Services->Rsync
Edit->Add Key-> Key Name: Paramaters
Edit->Add Key-> Key Name: Parameters
Edit->Add Value-> Value Name: AppDirectory Value: "C:\programfiles\rsync"
Edit->Add Value-> Value Name: Application Value: "C:\programfiles\rsync\rsync.exe"
Edit->Add Value-> Value Name: AppParamters Value: --config="C:\programfiles\rsync\rsyncd.conf" --daemon
Expand Down
2 changes: 1 addition & 1 deletion rsync-web/rsync-and-debian/rsync-and-debian.sgml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
problems more than most.

<p>
If there are issues ommitted by this document, or if you think
If there are issues omitted by this document, or if you think
the answers are incomplete, unbalanced, or incorrect, then
please mail <tt/mbp@samba.org/, <tt/rsync@lists.samba.org/
and/or <tt/debian-devel@lists.debian.org/.
Expand Down
2 changes: 1 addition & 1 deletion syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -3742,7 +3742,7 @@ int secure_mkstemp(char *template, mode_t perms, int operator_path)
}

/*
varient of do_open/do_open_nofollow which does do_open() if the
variant of do_open/do_open_nofollow which does do_open() if the
copy_links or copy_unsafe_links options are set and does
do_open_nofollow() otherwise
Expand Down
2 changes: 1 addition & 1 deletion usage.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ static void output_nno_list(enum logcode f, const char *name, struct name_num_ob

for (tok = strtok(tmpbuf, " "); tok; tok = next_tok) {
next_tok = strtok(NULL, " ");
if (*tok != '(') /* Ignore the alises in the JSON output */
if (*tok != '(') /* Ignore the aliases in the JSON output */
printf(" \"%s\"%s", tok, comma + (next_tok ? 0 : 1));
}

Expand Down
12 changes: 6 additions & 6 deletions zlib/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Changes in 1.2.7.1 (24 Mar 2013)
- Clean up the usage of z_const and respect const usage within zlib
- Clean up examples/gzlog.[ch] comparisons of different types
- Avoid shift equal to bits in type (caused endless loop)
- Fix unintialized value bug in gzputc() introduced by const patches
- Fix uninitialized value bug in gzputc() introduced by const patches
- Fix memory allocation error in examples/zran.c [Nor]
- Fix bug where gzopen(), gzclose() would write an empty file
- Fix bug in gzclose() when gzwrite() runs out of memory
Expand All @@ -53,7 +53,7 @@ Changes in 1.2.7.1 (24 Mar 2013)
- Fix types in contrib/minizip to match result of get_crc_table()
- Simplify contrib/vstudio/vc10 with 'd' suffix
- Add TOP support to win32/Makefile.msc
- Suport i686 and amd64 assembler builds in CMakeLists.txt
- Support i686 and amd64 assembler builds in CMakeLists.txt
- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
- Add vc11 and vc12 build files to contrib/vstudio
- Add gzvprintf() as an undocumented function in zlib
Expand Down Expand Up @@ -194,7 +194,7 @@ Changes in 1.2.5.2 (17 Dec 2011)
- Add a transparent write mode to gzopen() when 'T' is in the mode
- Update python link in zlib man page
- Get inffixed.h and MAKEFIXED result to match
- Add a ./config --solo option to make zlib subset with no libary use
- Add a ./config --solo option to make zlib subset with no library use
- Add undocumented inflateResetKeep() function for CAB file decoding
- Add --cover option to ./configure for gcc coverage testing
- Add #define ZLIB_CONST option to use const in the z_stream interface
Expand Down Expand Up @@ -260,7 +260,7 @@ Changes in 1.2.5.1 (10 Sep 2011)
- Check that pointers fit in ints when gzprint() compiled old style
- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
- Add debug records in assmebler code [Londer]
- Add debug records in assembler code [Londer]
- Update RFC references to use http://tools.ietf.org/html/... [Li]
- Add --archs option, use of libtool to configure for Mac OS X [Borstel]

Expand Down Expand Up @@ -927,7 +927,7 @@ Changes in 1.2.0.1 (17 March 2003)
- Include additional header file on VMS for off_t typedef
- Try to use _vsnprintf where it supplants vsprintf [Vollant]
- Add some casts in inffast.c
- Enchance comments in zlib.h on what happens if gzprintf() tries to
- Enhance comments in zlib.h on what happens if gzprintf() tries to
write more than 4095 bytes before compression
- Remove unused state from inflateBackEnd()
- Remove exit(0) from minigzip.c, example.c
Expand Down Expand Up @@ -1461,7 +1461,7 @@ Changes in 0.4:
- renamed deflateOptions as deflateInit2, call one or the other but not both
- added the method parameter for deflateInit2.
- added inflateInit2
- simplied considerably deflateInit and inflateInit by not supporting
- simplified considerably deflateInit and inflateInit by not supporting
user-provided history buffer. This is supported only in deflateInit2
and inflateInit2.

Expand Down
2 changes: 1 addition & 1 deletion zlib/README
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Notes for some targets:
- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
when compiled with cc.

- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
- On Digital Unix 4.0D (formerly OSF/1) on AlphaServer, the cc option -std1 is
necessary to get gzprintf working correctly. This is done by configure.

- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
Expand Down
2 changes: 1 addition & 1 deletion zlib/deflate.c
Original file line number Diff line number Diff line change
Expand Up @@ -1540,7 +1540,7 @@ local void fill_window(deflate_state *s)
* Copy without compression as much as possible from the input stream, return
* the current block state.
* This function does not insert new strings in the dictionary since
* uncompressible data is probably not useful. This function is used
* incompressible data is probably not useful. This function is used
* only for the level=0 compression option.
* NOTE: this function should be optimized to avoid extra copying from
* window to pending_buf.
Expand Down
2 changes: 1 addition & 1 deletion zlib/inftrees.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ typedef struct {
/* Maximum size of the dynamic table. The maximum number of code structures is
1444, which is the sum of 852 for literal/length codes and 592 for distance
codes. These values were found by exhaustive searches using the program
examples/enough.c found in the zlib distribtution. The arguments to that
examples/enough.c found in the zlib distribution. The arguments to that
program are the number of symbols, the initial root table size, and the
maximum bit length of a code. "enough 286 9 15" for literal/length codes
returns returns 852, and "enough 30 6 15" for distance codes returns 592.
Expand Down
2 changes: 1 addition & 1 deletion zlib/trees.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ local void tr_static_init(void)
}

/* ===========================================================================
* Genererate the file trees.h describing the static trees.
* Generate the file trees.h describing the static trees.
*/
#ifdef GEN_TREES_H
# ifndef DEBUG
Expand Down
6 changes: 3 additions & 3 deletions zlib/zlib.h
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
instead use raw inflate, see inflateInit2() below, or inflateBack() and
perform their own processing of the gzip header and trailer. When processing
gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
producted so far. The CRC-32 is checked against the gzip trailer.
produced so far. The CRC-32 is checked against the gzip trailer.
inflate() returns Z_OK if some progress has been made (more input processed
or more output produced), Z_STREAM_END if the end of the compressed data has
Expand Down Expand Up @@ -849,7 +849,7 @@ ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
to dictionary. dictionary must have enough space, where 32768 bytes is
always enough. If inflateGetDictionary() is called with dictionary equal to
Z_NULL, then only the dictionary length is returned, and nothing is copied.
Similary, if dictLength is Z_NULL, then it is not set.
Similarly, if dictLength is Z_NULL, then it is not set.
inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
stream state is inconsistent.
Expand Down Expand Up @@ -1419,7 +1419,7 @@ ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
If the flush parameter is Z_FINISH, the remaining data is written and the
gzip stream is completed in the output. If gzwrite() is called again, a new
gzip stream will be started in the output. gzread() is able to read such
concatented gzip streams.
concatenated gzip streams.
gzflush should be called only when strictly necessary because it will
degrade compression if called too often.
Expand Down
Loading