FYI, more doubled words

[Jim Meyering]

I've just done this:

* lib/argp-pv.c: Remove a doubled word in a comment.
* lib/check-version.c (check_version): Likewise.
* lib/javacomp.c (compile_java_class): Likewise.
* m4/glob.m4: Likewise.

Now, you too can check from the convenience of your own home.
You can use this script to find them:

#!/usr/bin/perl -n0
# Find doubled occurrences of words (e.g. in a TeX document).
# We often write "the the" with the duplicate words on separate lines.
# Written by Jim Meyering.
# $Id: doubleword,v 1.2 2006-07-09 11:42:01 meyering Exp $
use strict;
use warnings;

my %exclude = map { $_ => 1 } qw(fi shift m4 dnl long);

if (/^(.*\b(\w+)\s+\2\b.*)/m)
  {
    my ($text, $word) = ($1, $2);
    exists $exclude{$word}
      and next;

    # Avoid false-positive matches like these:
    # struct s s = (struct s) { 1, 2 };],
    # struct pkcs5 pkcs5[] =
    # struct saved_cwd saved_cwd;
    # struct uparams uparams = {
    # enum quoting_style quoting_style,
    # *file, enum backup_type backup_type)
    # enum read_header read_header (bool raw_extended_headers)
    $text =~ /(union|enum|struct)\s+$word\s+$word(\[\d*\])?\s*[,;=()]/
      and next;

    # Also, avoid FP multi-line matches like these:
    #
    # #ifdef STATIC
    # STATIC
    #
    # # if defined RANDOM_BITS
    # RANDOM_BITS (random_time_bits);
    $text =~ /^\s*\#\s*if(def|\s+defined)\s+$word\s+$word\b/m
      and next;

    # FIXME: make this a _real_ script and allow adding exceptions
    # via command line specified regexps.
    $text =~ /--$word\s+$word\b/m
      and next;

    print "$ARGV: $text\n"
  }

Index: lib/argp-pv.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/argp-pv.c,v
retrieving revision 1.3
diff -u -p -r1.3 argp-pv.c
--- lib/argp-pv.c       14 May 2005 06:03:57 -0000      1.3
+++ lib/argp-pv.c       9 Jul 2006 10:17:34 -0000
@@ -1,5 +1,5 @@
 /* Default definition for ARGP_PROGRAM_VERSION.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <address@hidden>.
 
@@ -19,6 +19,6 @@
 
 /* If set by the user program to a non-zero value, then a default option
    --version is added (unless the ARGP_NO_HELP flag is used), which will
-   print this this string followed by a newline and exit (unless the
+   print this string followed by a newline and exit (unless the
    ARGP_NO_EXIT flag is used).  Overridden by ARGP_PROGRAM_VERSION_HOOK.  */
 const char *argp_program_version;
Index: lib/check-version.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/check-version.c,v
retrieving revision 1.4
diff -u -p -r1.4 check-version.c
--- lib/check-version.c 19 Sep 2005 17:28:14 -0000      1.4
+++ lib/check-version.c 9 Jul 2006 10:17:34 -0000
@@ -1,5 +1,5 @@
 /* check-version.h --- Check version string compatibility.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -30,12 +30,11 @@
 /* Get specification. */
 #include "check-version.h"
 
-/* Check that the the version of the library (i.e., the CPP symbol
- * VERSION) is at minimum the requested one in REQ_VERSION (typically
- * found in a header file) and return the version string.  Return NULL
- * if the condition is not satisfied.  If a NULL is passed to this
- * function, no check is done, but the version string is simply
- * returned.
+/* Check that the version of the library (i.e., the CPP symbol VERSION)
+ * is at minimum the requested one in REQ_VERSION (typically found in
+ * a header file) and return the version string.  Return NULL if the
+ * condition is not satisfied.  If a NULL is passed to this function,
+ * no check is done, but the version string is simply returned.
  */
 const char *
 check_version (const char *req_version)
Index: lib/javacomp.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/javacomp.c,v
retrieving revision 1.4
diff -u -p -r1.4 javacomp.c
--- lib/javacomp.c      26 Apr 2006 15:55:46 -0000      1.4
+++ lib/javacomp.c      9 Jul 2006 10:17:34 -0000
@@ -1,5 +1,5 @@
 /* Compile a Java program.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -97,7 +97,7 @@ compile_java_class (const char * const *
       {
        /* Because $JAVAC may consist of a command and options, we use the
           shell.  Because $JAVAC has been set by the user, we leave all
-          all environment variables in place, including JAVA_HOME, and
+          environment variables in place, including JAVA_HOME, and
           we don't erase the user's CLASSPATH.  */
        char *old_classpath;
        unsigned int command_length;
Index: m4/glob.m4
===================================================================
RCS file: /sources/gnulib/gnulib/m4/glob.m4,v
retrieving revision 1.6
diff -u -p -r1.6 glob.m4
--- m4/glob.m4  6 Jul 2006 23:29:27 -0000       1.6
+++ m4/glob.m4  9 Jul 2006 10:17:34 -0000
@@ -5,7 +5,7 @@ dnl gives unlimited permission to copy a
 dnl with or without modifications, as long as this notice is preserved.
 
 # The glob module assumes you want GNU glob, with glob_pattern_p etc,
-# rather than vanilla POSIX glob.  This means your your code should
+# rather than vanilla POSIX glob.  This means your code should
 # always include <glob.h> for the glob prototypes.
 
 AC_DEFUN([gl_GLOB_SUBSTITUTE],