aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/gpg-connect-agent.c2
-rw-r--r--tools/gpg-wks-client.c2
-rw-r--r--tools/gpg-wks-server.c6
-rw-r--r--tools/gpgconf.c2
-rw-r--r--tools/gpgtar.c4
-rwxr-xr-xtools/mail-signed-keys2
-rw-r--r--tools/symcryptrun.c4
7 files changed, 11 insertions, 11 deletions
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 2d054f4da..59e219217 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -187,7 +187,7 @@ static assuan_context_t start_agent (void);
-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
static const char *
my_strusage( int level )
{
diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index 5814b4056..fa19fc14c 100644
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@@ -129,7 +129,7 @@ static gpg_error_t command_receive_cb (void *opaque,
-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
static const char *
my_strusage( int level )
{
diff --git a/tools/gpg-wks-server.c b/tools/gpg-wks-server.c
index ca89fc385..c17c1cf2e 100644
--- a/tools/gpg-wks-server.c
+++ b/tools/gpg-wks-server.c
@@ -133,7 +133,7 @@ static gpg_error_t command_cron (void);
-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
static const char *
my_strusage( int level )
{
@@ -1105,7 +1105,7 @@ process_new_key (server_ctx_t ctx, estream_t key)
if (policybuf.auth_submit)
{
- /* Bypass the confirmation stuff and publish the the key as is. */
+ /* Bypass the confirmation stuff and publish the key as is. */
log_info ("publishing address '%s'\n", sl->d);
/* FIXME: We need to make sure that we do this only for the
* address in the mail. */
@@ -1525,7 +1525,7 @@ command_receive_cb (void *opaque, const char *mediatype,
/* Return a list of all configured domains. ECh list element is the
- * top directory for for the domain. To figure out the actual domain
+ * top directory for the domain. To figure out the actual domain
* name strrchr(name, '/') can be used. */
static gpg_error_t
get_domain_list (strlist_t *r_list)
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index a5ee188ec..a9f4607bf 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -109,7 +109,7 @@ static ARGPARSE_OPTS opts[] =
};
-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
static const char *
my_strusage( int level )
{
diff --git a/tools/gpgtar.c b/tools/gpgtar.c
index 23176dc9c..3dff176e1 100644
--- a/tools/gpgtar.c
+++ b/tools/gpgtar.c
@@ -137,7 +137,7 @@ static ARGPARSE_OPTS tar_opts[] = {
-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
static const char *
my_strusage( int level )
{
@@ -507,7 +507,7 @@ main (int argc, char **argv)
/* Read the next record from STREAM. RECORD is a buffer provided by
the caller and must be at leadt of size RECORDSIZE. The function
- return 0 on success and and error code on failure; a diagnostic
+ return 0 on success and error code on failure; a diagnostic
printed as well. Note that there is no need for an EOF indicator
because a tarball has an explicit EOF record. */
gpg_error_t
diff --git a/tools/mail-signed-keys b/tools/mail-signed-keys
index c63001a45..3c564f11c 100755
--- a/tools/mail-signed-keys
+++ b/tools/mail-signed-keys
@@ -41,7 +41,7 @@ if [ -z "$signedby" ]; then
fi
if [ "$dryrun" = "0" ]; then
- echo "About to send the the keys signed by $signedby" >&2
+ echo "About to send the keys signed by $signedby" >&2
echo -n "to their owners. Do you really want to do this? (y/N)" >&2
read
[ "$REPLY" != "y" -a "$REPLY" != "Y" ] && exit 0
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index dc680f5a5..a72b9cf7a 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -191,7 +191,7 @@ struct
} opt;
-/* Print usage information and and provide strings for help. */
+/* Print usage information and provide strings for help. */
static const char *
my_strusage (int level)
{
@@ -997,7 +997,7 @@ main (int argc, char **argv)
setup_libgcrypt_logging ();
gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
- /* Tell simple-pwquery about the the standard socket name. */
+ /* Tell simple-pwquery about the standard socket name. */
{
char *tmp = make_filename (gnupg_socketdir (), GPG_AGENT_SOCK_NAME, NULL);
simple_pw_set_socket (tmp);