Permalink
Browse files

Correct spelling mistakes. (#286)

I'm going to merge this. It seems correct.
Thanks for the contribution.
  • Loading branch information...
EdwardBetts authored and thedrow committed Sep 25, 2018
1 parent 24f73c5 commit c77c62651b8974b8d3c738467138250078c112fe
Showing with 45 additions and 45 deletions.
  1. +2 −2 INSTALL
  2. +1 −1 README.packaging
  3. +2 −2 TODO
  4. +2 −2 configure.ac
  5. +1 −1 doc/example/init
  6. +1 −1 doc/protocol-1.txt
  7. +1 −1 doc/protocol-3.txt
  8. +1 −1 doc/web/distcc-lca-2004.html
  9. +1 −1 man/distcc.1
  10. +2 −2 man/include_server.1
  11. +3 −3 popt/popt.h
  12. +1 −1 pump.in
  13. +1 −1 src/arg.c
  14. +2 −2 src/compile.c
  15. +1 −1 src/compress.c
  16. +2 −2 src/distcc.h
  17. +1 −1 src/dotd.c
  18. +1 −1 src/hosts.c
  19. +1 −1 src/hosts.h
  20. +4 −4 src/lock.c
  21. +1 −1 src/mon-gnome.c
  22. +1 −1 src/mon.c
  23. +1 −1 src/mon.h
  24. +1 −1 src/prefork.c
  25. +1 −1 src/serve.c
  26. +1 −1 src/snprintf.c
  27. +1 −1 src/stats.c
  28. +1 −1 src/strip.c
  29. +1 −1 src/trace.h
  30. +1 −1 src/util.c
  31. +3 −3 src/zeroconf.c
  32. +1 −1 test/testdistcc.py
View
@@ -56,7 +56,7 @@ To build distcc you need
A C compiler
GNU libiberty (distributed with GNU Binutils and GCC)
It is also highly desireable to have
It is also highly desirable to have
Python >=3.1
@@ -256,7 +256,7 @@ For SSH connections
localhost @red @green @blue
The hosts should be listed in descending order of speed. localhost
should normally be first, unless it is signficantly slower than
should normally be first, unless it is significantly slower than
another machine. If you many hosts (say ten or more), it's probably
better to leave localhost out of the list.
View
@@ -63,7 +63,7 @@ consider these requests.
'i386-redhat-linux-cc-3.2.2'). This makes it much more likely that
people will be able to plug-and-go for cross-architecture or
cross-OS builds. It's good to name even native compilers this way
so that they can participate in heterogenous builds. If you don't
so that they can participate in heterogeneous builds. If you don't
maintain the compiler packages for your OS, please talk to the
person who does.
View
4 TODO
@@ -19,7 +19,7 @@ failing to resolve a host should be a soft failure
State files depend on host byte order and break when DISTCC_DIR is
shared between heterogenous machines. Of course sharing this
shared between heterogeneous machines. Of course sharing this
directory is probably a bad idea anyhow.
@@ -1049,7 +1049,7 @@ central configuration
would be good, and probably quite practical. Setting up a list of
machines centrally rather than configuring each one sounds more friendly.
The most likely design is to use DNS SRV records (RFC2052), or perhaps
multi-RR A records. For exmaple, compile.ozlabs.foo.com would resolve to
multi-RR A records. For example, compile.ozlabs.foo.com would resolve to
all relevant machines. Another possibility would be to use SLP, the
Service Location Protocol, but that adds a larger dependency and it seems
not to be widely deployed.
View
@@ -22,7 +22,7 @@ AC_CONFIG_HEADERS(src/config.h)
# either set CPPFLAGS and LDFLAGS when running configure, or use
# --with-extra-foo.
# Check for socklen_t, and do something appropiate on systems
# Check for socklen_t, and do something appropriate on systems
# that don't have it.
AC_CHECK_TYPE([socklen_t], ,[
AC_MSG_CHECKING([for socklen_t equivalent])
@@ -59,7 +59,7 @@ getpeername(0,0,&len);
#include <sys/socket.h>])
dnl Android requires -llog for printf and friends
dnl and will only run position independant executables
dnl and will only run position independent executables
AC_MSG_CHECKING([if building on Android])
AC_TRY_COMPILE([
#ifdef __BIONIC__
View
@@ -1,7 +1,7 @@
#! /bin/sh
#
# chkconfig: - 60 20
# description: The distcc deamon
# description: The distcc daemon
# http://code.google.com/p/distcc/
#
# processname: distccd
View
@@ -117,7 +117,7 @@ any person examining the network stream.]
[note: Sending the parameter as hexadecimal is redundant, because four
bytes would be sufficient to encode the 32-bit integer. Sending as
hexadecimal serves as a futher check that the client and server are
hexadecimal serves as a further check that the client and server are
synchronized. Incorrect values for the parameter are detected as a
program or network error.]
View
@@ -72,7 +72,7 @@ DOTD <len> <bytes>
Notes
-----
This protocol is most useful in conjuction with an "include server" that
This protocol is most useful in conjunction with an "include server" that
discovers, for each compilation unit, the list of needed files without
actually preprocessing. The protocol for talking to the include server
is simple: distcc sends a CDIR packet, and an ARGC/ARGV sequence with the
@@ -649,7 +649,7 @@ <h1><a name="conclusions">5   Conclusions</a></h1>
<p>A few maxims about demonstration of software projects have been borne
out by distcc's development. Before development began, a feasibility
study demonstrated that the concept could work. The design is
intentionally simple and the scope modestly focussed on a subset of
intentionally simple and the scope modestly focused on a subset of
important problems. Strong logging helps get useful results from
distributed community testing. Performance features such as
compression and new network APIs were used selectively in places where
View
@@ -491,7 +491,7 @@ executed remotely, may
force the machine to swap, which reduces performance over just running the
jobs in sequence without swapping. Getting the number of parallel preprocessors just
right allows you to use larger parallel factors with make, since the local machine
now has some machanism for measuring local resource usage.
now has some mechanism for measuring local resource usage.
.PP
Finally there is the host entry
.PP
View
@@ -53,7 +53,7 @@ Bit vector for turning on warnings and debugging
other powers of two: see include_server/basics.py.
.TP
.B -e, --email
Send email to 'distcc-pump-errors' or if defined, the value of enviroment
Send email to 'distcc-pump-errors' or if defined, the value of environment
variable DISTCC_EMAILLOG_WHOM_TO_BLAME, when include server gets in trouble.
The default is to not send email.
.TP
@@ -111,7 +111,7 @@ different from the actual configuration.
.TP
.B --no_force_dirs
Do not force the creation of all directories used
in an include path. May improve peformance for
in an include path. May improve performance for
some cases, but will break builds which use
include structures like "<foo/../file.h>" without
including other files in foo/.
View
@@ -83,7 +83,7 @@
#define POPT_ERROR_NOARG -10 /*!< missing argument */
#define POPT_ERROR_BADOPT -11 /*!< unknown option */
#define POPT_ERROR_OPTSTOODEEP -13 /*!< aliases nested too deeply */
#define POPT_ERROR_BADQUOTE -15 /*!< error in paramter quoting */
#define POPT_ERROR_BADQUOTE -15 /*!< error in parameter quoting */
#define POPT_ERROR_ERRNO -16 /*!< errno set, use strerror(errno) */
#define POPT_ERROR_BADNUMBER -17 /*!< invalid numeric value */
#define POPT_ERROR_OVERFLOW -18 /*!< number too large or too small */
@@ -456,7 +456,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
/** \ingroup popt
* Print detailed description of options.
* @param con context
* @param fp ouput file handle
* @param fp output file handle
* @param flags (unused)
*/
void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
@@ -466,7 +466,7 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
/** \ingroup popt
* Print terse description of options.
* @param con context
* @param fp ouput file handle
* @param fp output file handle
* @param flags (unused)
*/
void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
View
@@ -96,7 +96,7 @@ Environment variables (all optional):
the location.
If this location is the build directory, then Python
sources are retrived from the source directory.
sources are retrieved from the source directory.
DISTCC_POTENTIAL_HOSTS The distcc servers that will be queried by lsdistcc
in order to produce a value for DISTCC_HOSTS.
View
@@ -41,7 +41,7 @@
*
* We need to distinguish the two by working out whether the first argument
* "looks like" a compiler name or not. I think the two cases in which we
* should assume it's implicit are "distcc -c hello.c" (starts with a hypen),
* should assume it's implicit are "distcc -c hello.c" (starts with a hyphen),
* and "distcc hello.c" (starts with a source filename.)
*
* In the case of implicit compilation "distcc --help" will always give you
View
@@ -757,7 +757,7 @@ dcc_build_somewhere(char *argv[],
/* It's unfortunate that the variable that controls that is in the
* "host" datastructure, even though in this case it's the client
* that fails to support it, but "host" is what gets passed
* around in the client code. We are, in essense, throwing away
* around in the client code. We are, in essence, throwing away
* the host's capability to do cpp, so if this code was to execute
* again (it won't, not in the same process) we wouldn't know if
* the server supports it or not.
@@ -863,7 +863,7 @@ dcc_build_somewhere(char *argv[],
(Currently, we send email to an appropriate email address).
*/
if (getenv("DISTCC_SKIP_LOCAL_RETRY")) {
/* dont retry locally. We'll treat the remote failure as
/* don't retry locally. We'll treat the remote failure as
if it was a local one. But if we can't get the failures
then we need to retry regardless.
*/
View
@@ -118,7 +118,7 @@ int dcc_compress_file_lzo1x(int in_fd,
/**
* Send LZO-compressed bulk data.
*
* The most straighforward method for miniLZO is to just send everything in
* The most straightforward method for miniLZO is to just send everything in
* one big chunk. So we just read the whole input into a buffer, build the
* output in a buffer, and send it once its complete.
**/
View
@@ -87,13 +87,13 @@ struct dcc_hostdef;
enum dcc_compress {
/* wierd values to catch errors */
/* weird values to catch errors */
DCC_COMPRESS_NONE = 69,
DCC_COMPRESS_LZO1X
};
enum dcc_cpp_where {
/* wierd values to catch errors */
/* weird values to catch errors */
DCC_CPP_ON_CLIENT = 42,
DCC_CPP_ON_SERVER
};
View
@@ -150,7 +150,7 @@ int dcc_cleanup_dotd(const char *dotd_fname,
/* Go through arguments (in @p argv), and relevant environment variables, and
* find out where the dependencies output should go. Return that location in a
* newly allocated string in @p dotd_fname. @p needs_dotd is set to true if the
* compilation command line and environent imply that a .d file must be
* compilation command line and environment imply that a .d file must be
* produced. @p sets_dotd_target is set to true if there is a -MQ or -MT
* option. This is to be used on the client, so that the client knows where to
* put the .d file it gets from the server. @p dotd_target is set only if
View
@@ -207,7 +207,7 @@ int dcc_get_hostlist(struct dcc_hostdef **ret_list,
* *psrc is the current parse cursor; it is advanced over what is read.
*
* If a multiplier is present, *psrc points to a substring starting with '/'.
* The host defintion is updated to the numeric value following. Otherwise
* The host definition is updated to the numeric value following. Otherwise
* the hostdef is unchanged.
**/
static int dcc_parse_multiplier(const char **psrc, struct dcc_hostdef *hostdef)
View
@@ -60,7 +60,7 @@ struct dcc_hostdef {
enum dcc_cpp_where cpp_where;
#ifdef HAVE_GSSAPI
/* Are we autenticating with this host? */
/* Are we authenticating with this host? */
int authenticate;
#endif
View
@@ -23,7 +23,7 @@
/* Power is nothing without control
* -- Pirelli tyre advertisment. */
* -- Pirelli tyre advertisement. */
/**
@@ -83,7 +83,7 @@
* - Each distcc process should hold no more than two locks at a time;
* one local lock, and one remote lock.
*
* - When acquring more than one lock, a strict lock ordering discipline
* - When acquiring more than one lock, a strict lock ordering discipline
* must be observed: the remote lock must be acquired first, before the
* local lock; and conversely the local lock must be released first,
* before the remote lock.
@@ -250,7 +250,7 @@ int dcc_open_lockfile(const char *fname, int *plockfd)
* in user home directories. */
*plockfd = open(fname, O_WRONLY|O_CREAT, 0666);
if (*plockfd == -1 && errno != EEXIST) {
rs_log_error("failed to creat %s: %s", fname, strerror(errno));
rs_log_error("failed to create %s: %s", fname, strerror(errno));
return EXIT_IO_ERROR;
}
@@ -262,7 +262,7 @@ int dcc_open_lockfile(const char *fname, int *plockfd)
* Lock a server slot, in either blocking or nonblocking mode.
*
* In blocking mode, this function will not return until either the lock has
* been acquired, or an error occured. In nonblocking mode, it will instead
* been acquired, or an error occurred. In nonblocking mode, it will instead
* return EXIT_BUSY if some other process has this slot locked.
*
* @param slot 0-based index of available slots on this host.
View
@@ -261,7 +261,7 @@ dcc_set_row_idle(GtkListStore *model,
* nothing now.
*
* Every time through, we update each table row exactly once, whether
* that is adding new state, settting it back to idle, or inserting
* that is adding new state, setting it back to idle, or inserting
* it. In particular, on each pass we add one value to the start of
* every state history.
**/
View
@@ -358,7 +358,7 @@ int dcc_mon_poll(struct dcc_task_state **p_list)
&& pthis) {
/* We can succeed without getting a new entry back, but it
* turns out that this time we did get one. So insert it
* intot he right point on the list. */
* into the right point on the list. */
dcc_mon_insert_sorted(p_list, pthis);
}
}
View
@@ -198,7 +198,7 @@ extern "C" {
/**
* Read the list of running processes for this user.
*
* @param ppl On return, recieves a pointer to the start of a list of
* @param ppl On return, receives a pointer to the start of a list of
* status elements, representing the running processes. *ppl will be
* NULL if there are no processes running.
*
View
@@ -70,7 +70,7 @@ static int dcc_preforked_child(int listen_fd);
int dcc_preforking_parent(int listen_fd)
{
int ret;
/* use sigaction instead of signal() because we need persistant handler, not oneshot */
/* use sigaction instead of signal() because we need persistent handler, not oneshot */
struct sigaction act_child;
memset(&act_child, 0, sizeof act_child);
act_child.sa_handler = dcc_sigchld_handler;
View
@@ -363,7 +363,7 @@ static int dcc_check_compiler_masq(char *compiler_name)
*
* Before this it was possible to execute arbitrary command after connecting
* to distcc, which is quite a security risk when combined with any local root
* privledge escalation exploit. See CVE 2004-2687
* privilege escalation exploit. See CVE 2004-2687
*
* https://nvd.nist.gov/vuln/detail/CVE-2004-2687
* https://github.com/distcc/distcc/issues/155
View
@@ -35,7 +35,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 -DTEST_SNPRINTF -o snprintf snprintf.c -lm
View
@@ -178,7 +178,7 @@ static void dcc_stats_update_compile_times(struct statsdata *sd) {
free(curr_sd);
curr_sd = prev_sd->next;
} else {
/* we didn't delete anyting. move forward by one */
/* we didn't delete anything. move forward by one */
prev_sd = curr_sd;
curr_sd = curr_sd->next;
}
View
@@ -48,7 +48,7 @@
* remotely, it is possible that omitting these options will make
* failure more obvious and avoid false success.
*
* Giving -L on a compile-only command line is a bit wierd, but it is
* Giving -L on a compile-only command line is a bit weird, but it is
* observed to happen in Makefiles that are not strict about CFLAGS vs
* LDFLAGS, etc.
*
View
@@ -128,7 +128,7 @@ void rs_logger_file(int level, const char *fn, char const *fmt, va_list va,
void rs_logger_syslog(int level, const char *fn, char const *fmt, va_list va,
void *, int);
/** Check whether the library was compiled with debugging trace suport. */
/** Check whether the library was compiled with debugging trace support. */
int rs_supports_trace(void);
void rs_log0(int level, char const *fn, char const *fmt, ...)
View
@@ -746,7 +746,7 @@ void dcc_get_disk_io_stats(int *n_reads, int *n_writes) {
*n_writes += writes;
} else {
#if 0
/* individual parition stats */
/* individual partition stats */
retval = fscanf(f, " %*d %d %*d %d", &reads, &writes);
if (retval == EOF || retval != 2)
break;
View
@@ -52,7 +52,7 @@
/* How long shall the background daemon be idle before i terminates itself? */
#define MAX_IDLE_TIME 20
/* Maxium size of host file to load */
/* Maximum size of host file to load */
#define MAX_FILE_SIZE (1024*100)
/* General daemon data */
@@ -84,7 +84,7 @@ struct host {
AvahiServiceResolver *resolver;
};
/* A generic, system independant lock routine, similar to sys_lock,
/* A generic, system independent lock routine, similar to sys_lock,
* but more powerful:
* rw: if non-zero: r/w lock instead of r/o lock
* enable: lock or unlock
@@ -503,7 +503,7 @@ static int daemon_proc(const char *host_file, const char *lock_file, int n_slots
/* Iterate the main loop for 5s */
if (avahi_simple_poll_iterate(d.simple_poll, 5000) != 0) {
rs_log_crit("Event loop exited abnormaly.\n");
rs_log_crit("Event loop exited abnormally.\n");
goto finish;
}
}
Oops, something went wrong.

0 comments on commit c77c626

Please sign in to comment.