Update copyright year

Nuked some trailing spaces.

2 files changed, 42 insertions, 38 deletions

diff --git a/tools/ChangeLog b/tools/ChangeLog
index 110e43ef1..79eea39c6 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-03  Werner Koch  <wk@g10code.com>
+
+	* watchgnupg.c (print_version): Update copyright year.
+
 2010-12-14  Werner Koch  <wk@g10code.com>
 
 	* gpgconf-comp.c (gc_options_gpg_agent, gc_options_scdaemon)
@@ -334,7 +338,7 @@
 	* gpgconf-comp.c (my_percent_escape): Make non-static and rename
 	to ...
 	(gc_percent_escape): ... this.  Change all callers.
-	
+
 2008-05-26  Werner Koch  <wk@g10code.com>
 
 	* gpgconf-comp.c (gpg_agent_runtime_change) [W32]: Issue
@@ -456,7 +460,7 @@
 	(handle_inquire): Implement new command.
 	(substitute_line_copy): New.
 	(unescape_string, unpercent_string): New.
-	* no-libgcrypt.c (gcry_set_outofcore_handler) 
+	* no-libgcrypt.c (gcry_set_outofcore_handler)
 	(gcry_set_fatalerror_handler, gcry_set_log_handler): New.
 	* Makefile.am (gpg_connect_agent_LDADD): Link to libreadline.
 
@@ -678,7 +682,7 @@
 	min-passphrase-length.  Apply new flag to some of them.
 	(gc_process_gpgconf_conf, key_matches_user_or_group): New.
 	(gc_component_change_options): Factor some code out to ..
-	(change_one_value): .. new. 
+	(change_one_value): .. new.
 	(gc_component_retrieve_options): Allow -1 for COMPONENT to iterate
 	over al components.
 	* gpgconf.c (main): New commands --check-config and
@@ -721,7 +725,7 @@
 
 2006-10-20  Werner Koch  <wk@g10code.com>
 
-	* gpgsm-gencert.sh: Enhanced the main menu. 
+	* gpgsm-gencert.sh: Enhanced the main menu.
 
 2006-10-12  Werner Koch  <wk@g10code.com>
 
@@ -853,7 +857,7 @@
 
 2005-06-01  Werner Koch  <wk@g10code.com>
 
-	* symcryptrun.c: Include mkdtemp.h. 
+	* symcryptrun.c: Include mkdtemp.h.
 
 2005-05-31  Werner Koch  <wk@g10code.com>
 
@@ -907,7 +911,7 @@
 2005-04-11  Marcus Brinkmann  <marcus@g10code.de>
 
 	* symcryptrun.c: Implement config file parsing.
-	
+
 	* Makefile.am (bin_PROGRAMS): Add symcryptrun.
 	(symcryptrun_SOURCES, symcryptrun_LDADD): New variables.
 	* symcryptrun.c: New file.
@@ -927,7 +931,7 @@
 2005-02-24  Werner Koch  <wk@g10code.com>
 
 	* gpg-connect-agent.c: New.
-	* Makefile.am: Add it. 
+	* Makefile.am: Add it.
 
 2004-12-21  Werner Koch  <wk@g10code.com>
 
@@ -971,7 +975,7 @@
 2004-10-01  Werner Koch  <wk@g10code.com>
 
 	* gpgconf-comp.c: Made all strings for --log-file read the same.
-	
+
 2004-10-01  Werner Koch  <wk@g10code.com>
 
 	* gpgconf-comp.c (my_dgettext): Also switch codeset and directory
@@ -1003,8 +1007,8 @@
 
 	* no-libgcrypt.c (gcry_realloc, gcry_xmalloc, gcry_xcalloc): New.
 
-	* gpgconf-comp.c (retrieve_options_from_program) 
-	(retrieve_options_from_file, change_options_file) 
+	* gpgconf-comp.c (retrieve_options_from_program)
+	(retrieve_options_from_file, change_options_file)
 	(change_options_program, gc_component_change_options): Replaced
 	getline by read_line and test for allocation failure.
 
@@ -1072,7 +1076,7 @@
 	(gc_component_change_options): New variable runtime.  Initialize
 	it.  If an option is changed that has the GC_OPT_FLAG_RUNTIME bit
 	set, also set the corresponding runtime variable.  Finally, call
-	the runtime_change callback of the backend if needed.	
+	the runtime_change callback of the backend if needed.
 
 2004-03-16  Werner Koch  <wk@gnupg.org>
 
@@ -1163,7 +1167,7 @@
 	quote in pathname.
 	(change_options_program): Percent deescape string before writing
 	it out.
-	
+
 	* gpgconf-comp.c (gc_component_list_options): Do not skip groups
 	on output.
 
@@ -1197,10 +1201,10 @@
 	* gpgconf-comp.c: Use xmalloc, libcommon's asctimestamp and
 	gnupg_get_time, fix error() invocation and use getline()
 	consistently.
-	
+
 2004-01-30  Werner Koch  <wk@gnupg.org>
 
-	* addgnupghome: Also set the group of copied files. 
+	* addgnupghome: Also set the group of copied files.
 
 2004-01-30  Werner Koch  <wk@gnupg.org>
 
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index 958605c62..592819be0 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -1,5 +1,5 @@
 /* watchgnupg.c - Socket server for GnuPG logs
- *	Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ *	Copyright (C) 2003, 2004, 2010 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -111,7 +111,7 @@ xrealloc (void *old, size_t n)
     die ("out of core");
   return p;
 }
-    
+
 
 struct client_s {
   struct client_s *next;
@@ -119,7 +119,7 @@ struct client_s {
   size_t size;  /* Allocated size of buffer. */
   size_t len;   /* Current length of buffer. */
   unsigned char *buffer; /* Buffer to with data already read. */
-  
+
 };
 typedef struct client_s *client_t;
 
@@ -134,9 +134,9 @@ print_fd_and_time (int fd)
 {
   struct tm *tp;
   time_t atime = time (NULL);
-  
+
   tp = localtime (&atime);
-  if (time_only)  
+  if (time_only)
     printf ("%3d - %02d:%02d:%02d ",
             fd,
             tp->tm_hour, tp->tm_min, tp->tm_sec );
@@ -161,7 +161,7 @@ print_line (client_t c, const char *line)
       if (c->buffer && c->len)
         {
           print_fd_and_time (c->fd);
-          fwrite (c->buffer, c->len, 1, stdout); 
+          fwrite (c->buffer, c->len, 1, stdout);
           putc ('\n', stdout);
           c->len = 0;
         }
@@ -173,10 +173,10 @@ print_line (client_t c, const char *line)
       print_fd_and_time (c->fd);
       if (c->buffer && c->len)
         {
-          fwrite (c->buffer, c->len, 1, stdout); 
+          fwrite (c->buffer, c->len, 1, stdout);
           c->len = 0;
         }
-      fwrite (line, s - line + 1, 1, stdout); 
+      fwrite (line, s - line + 1, 1, stdout);
       line = s + 1;
     }
   n = strlen (line);
@@ -197,7 +197,7 @@ print_line (client_t c, const char *line)
 
 static void
 setup_client (int server_fd, int is_un)
-{ 
+{
   struct sockaddr_un addr_un;
   struct sockaddr_in addr_in;
   struct sockaddr *addr;
@@ -227,7 +227,7 @@ setup_client (int server_fd, int is_un)
       close (fd);
       printf ("[connection request denied: too many connections]\n");
     }
-  else 
+  else
     {
       for (client = client_list; client && client->fd != -1;
            client = client->next)
@@ -250,14 +250,14 @@ static void
 print_version (int with_help)
 {
   fputs (MYVERSION_LINE "\n"
-         "Copyright (C) 2004 Free Software Foundation, Inc.\n"
+         "Copyright (C) 2010 Free Software Foundation, Inc.\n"
          "License GPLv3+: "
          "GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
          "This is free software: you are free to change and redistribute it.\n"
          "There is NO WARRANTY, to the extent permitted by law.\n",
          stdout);
   if (with_help)
-    fputs 
+    fputs
       ("\n"
        "Usage: " PGM " [OPTIONS] SOCKETNAME\n"
        "       " PGM " [OPTIONS] PORT [SOCKETNAME]\n"
@@ -271,11 +271,11 @@ print_version (int with_help)
        "  --version   print version of the program and exit\n"
        "  --help      display this help and exit\n"
        BUGREPORT_LINE, stdout );
-  
+
   exit (0);
 }
 
-int 
+int
 main (int argc, char **argv)
 {
   int last_argc = -1;
@@ -290,7 +290,7 @@ main (int argc, char **argv)
   unsigned short port;
   int server_un, server_in;
   int flags;
- 
+
   if (argc)
     {
       argc--; argv++;
@@ -327,15 +327,15 @@ main (int argc, char **argv)
           tcp = 1;
           argc--; argv++;
         }
-    }          
- 
+    }
+
   if (!((!tcp && argc == 1) || (tcp && (argc == 1 || argc == 2))))
     {
       fprintf (stderr, "usage: " PGM " socketname\n"
                        "       " PGM " --tcp port [socketname]\n");
       exit (1);
     }
-  
+
   if (tcp)
     {
       port = atoi (*argv);
@@ -354,7 +354,7 @@ main (int argc, char **argv)
       server_in = socket (PF_INET, SOCK_STREAM, 0);
       if (server_in == -1)
         die ("socket(PF_INET) failed: %s\n", strerror (errno));
-      if (setsockopt (server_in, SOL_SOCKET, SO_REUSEADDR, 
+      if (setsockopt (server_in, SOL_SOCKET, SO_REUSEADDR,
                       (unsigned char *)&i, sizeof (i)))
         err ("setsockopt(SO_REUSEADDR) failed: %s\n", strerror (errno));
       if (verbose)
@@ -393,7 +393,7 @@ main (int argc, char **argv)
       if ( fcntl (server_un, F_SETFL, (flags | O_NONBLOCK)) == -1)
         die ("fcntl (F_SETFL) failed: %s\n", strerror (errno));
     }
-  
+
   if (tcp)
     {
       memset (&srvr_addr_in, 0, sizeof srvr_addr_in);
@@ -414,13 +414,13 @@ main (int argc, char **argv)
     }
   else
     addrlen_un = 0;  /* Silent gcc.  */
-  
+
   if (server_in != -1 && bind (server_in, addr_in, addrlen_in))
     die ("bind to port %hu failed: %s\n", port, strerror (errno));
 
  again:
   if (server_un != -1 && bind (server_un, addr_un, addrlen_un))
-    { 
+    {
       if (errno == EADDRINUSE && force)
         {
           force = 0;
@@ -479,7 +479,7 @@ main (int argc, char **argv)
           {
             char line[256];
             int n;
-            
+
             n = read (client->fd, line, sizeof line - 1);
             if (n < 0)
               {
@@ -490,7 +490,7 @@ main (int argc, char **argv)
                 close (client->fd);
                 client->fd = -1;
               }
-            else if (!n) 
+            else if (!n)
               {
                 print_line (client, NULL); /* flush */
                 close (client->fd);