[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-133-gec19d06

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=ec19d062daf1e3402fefa1f81f59a9460a878e9d

The branch, master has been updated
       via  ec19d062daf1e3402fefa1f81f59a9460a878e9d (commit)
       via  f3979adfaa91df2a36e75dda11f6aae84149ca85 (commit)
       via  e8a049d48816579cd04d339724779f414077fec3 (commit)
      from  50c5eb094704ebfe272b695a89ad35280a40a716 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ec19d062daf1e3402fefa1f81f59a9460a878e9d
Author: Eric Blake <address@hidden>
Date:   Tue Jun 3 09:17:42 2008 -0600

    Fix printf type mismatches.
    
    * m4/m4module.h (m4_bad_argc): Alter parameter type.
    * m4/m4private.h (struct m4_call_info): Alter call_id type.
    * m4/macro.c (expand_macro, m4__adjust_refcount): Use correct
    specifiers.
    * m4/utility.c (m4_bad_argc): Likewise.
    
    Signed-off-by: Eric Blake <address@hidden>

commit f3979adfaa91df2a36e75dda11f6aae84149ca85
Author: Eric Blake <address@hidden>
Date:   Tue Jun 3 09:08:29 2008 -0600

    Borrow bootstrap ideas from gnulib.
    
    * bootstrap (options, DOWNLOAD_PO): Remove --download-po; the
    advertized subset of languages didn't work.  Use --skip-po
    instead, for consistency with gnulib bootstrap.
    (func_get_translations): Use rsync, not wget.
    (func_update_po): Use a reference directory, to avoid changing
    timestamps on unchanged .po files.
    * TODO: Update accordingly.
    
    Signed-off-by: Eric Blake <address@hidden>

commit e8a049d48816579cd04d339724779f414077fec3
Author: Eric Blake <address@hidden>
Date:   Tue Jun 3 14:16:14 2008 -0600

    Fix fallout from previous patch.
    
    * doc/m4.texinfo (Builtin): Adjust expected output.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |   21 ++++++++
 HACKING        |    2 +-
 TODO           |   10 +---
 bootstrap      |  140 +++++++++++++++++++++-----------------------------------
 doc/m4.texinfo |   17 ++++++-
 m4/m4module.h  |    2 +-
 m4/m4private.h |    2 +-
 m4/macro.c     |    6 +-
 m4/utility.c   |    6 +-
 po/.cvsignore  |    1 +
 po/.gitignore  |    1 +
 11 files changed, 101 insertions(+), 107 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f06aee7..b94b250 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2008-06-03  Eric Blake  <address@hidden>
+
+       Fix printf type mismatches.
+       * m4/m4module.h (m4_bad_argc): Alter parameter type.
+       * m4/m4private.h (struct m4_call_info): Alter call_id type.
+       * m4/macro.c (expand_macro, m4__adjust_refcount): Use correct
+       specifiers.
+       * m4/utility.c (m4_bad_argc): Likewise.
+
+       Borrow bootstrap ideas from gnulib.
+       * bootstrap (options, DOWNLOAD_PO): Remove --download-po; the
+       advertized subset of languages didn't work.  Use --skip-po
+       instead, for consistency with gnulib bootstrap.
+       (func_get_translations): Use rsync, not wget.
+       (func_update_po): Use a reference directory, to avoid changing
+       timestamps on unchanged .po files.
+       * TODO: Update accordingly.
+
+       Fix fallout from previous patch.
+       * doc/m4.texinfo (Builtin): Adjust expected output.
+
 2008-06-02  Eric Blake  <address@hidden>
 
        Stage 24c: Improve display of macro names with embedded NUL.
diff --git a/HACKING b/HACKING
index 2bf2f6a..799b11a 100644
--- a/HACKING
+++ b/HACKING
@@ -207,7 +207,7 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny change)
   (esp. bug-m4) for outstanding bug reports also in the list of
   pending moderation requests.  This step is not strictly necessary.
 
-* Make sure you have wget installed.
+* Make sure you have rsync installed.
 
 * Make sure you have a copy of xdelta installed, and a copy of the previous
   release tarball in the build directory.
diff --git a/TODO b/TODO
index f138dd2..70c9f62 100644
--- a/TODO
+++ b/TODO
@@ -31,6 +31,8 @@ for any of these ideas or if you have others to add.
     Marc Espie
     address@hidden
 
+    Perhaps the gnulib c-stack module or libsigsegv would be useful:
+    http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00042.html
 
 * FEATURES OR PROBLEMS
 
@@ -129,11 +131,3 @@ for any of these ideas or if you have others to add.
     is found on the build machine.  For that matter, it has been a
     while since the perl module has even been built, and perl has had
     new releases in the meantime.
-
-* OTHER TOOLS
-
-  + Copy coreutils' idea of using rsync, not wget, for grabbing .po
-    files efficiently.
-
-  + Use gnulib's build-aux/git-version-gen for reliable version
-    numbers, now that CVS timestamps are no longer available.
diff --git a/bootstrap b/bootstrap
index 77e0c71..ad3ce1f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2008-04-15
+# bootstrap (GNU M4) version 2008-06-03
 # Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 # This is free software: you are free to change and redistribute it.
@@ -26,16 +26,13 @@
 # Usage: $progname [options]
 
 # -f      --force            bootstrap even when sources are not from git
-# -p ARG  --download-po=ARG  whether to download pofiles [yes]
+#         --skip-po          skip downloading pofiles
 # -v      --version          print version information
 # -h,-?   --help             print short or long help message
 
-# For --download-po, ARG can also be `no' to skip pofile downloads,
-# `only' to just update pofiles, or a set of locales to add or update.
-
 # You can also set the following variables to help $progname
 # locate the right tools:
-#   AUTOPOINT, AUTORECONF, AWK, GNULIB_TOOL, LIBTOOLIZE, M4, RM, SED, WGET
+#   AUTOPOINT, AUTORECONF, AWK, GNULIB_TOOL, LIBTOOLIZE, M4, RM, SED
 
 # This script bootstraps a git or CVS checkout of GNU M4 by correctly calling
 # out to parts of the GNU Build Platform.  Currently this requires GNU
@@ -56,13 +53,9 @@
 : ${M4=m4}
 : ${RM=rm -f}
 : ${SED=sed}
-: ${WGET=wget}
-export WGET
-
-: ${DOWNLOAD_PO=yes}
 
 # Ensure file names are sorted consistently across platforms.
-# Also, ensure diagnostics are in English, e.g., "wget --help" below.
+# Also, ensure diagnostics are in English.
 LC_ALL=C
 export LC_ALL
 
@@ -213,29 +206,8 @@ func_update ()
     opt="$1"
     shift
     case $opt in
-      -p|--download-po)
-                       test $# = 0 && func_missing_arg $opt && break
-                       case $1 in
-                         0|[Nn]*|[Ff]*) DOWNLOAD_PO=no ;;
-                         [Oo]*)         DOWNLOAD_PO=only ;;
-                       esac
-                       ;;
-
-      # Separate optargs to long options:
-      --download-po=*)
-                       arg=`echo "$opt" | $SED "$my_sed_long_arg"`
-                       opt=`echo "$opt" | $SED "$my_sed_long_opt"`
-                       set -- "$opt" "$arg" ${1+"$@"}
-                       ;;
-
-      # Separate optargs to short options:
-      -p*)
-                       arg=`echo "$opt" |$SED "$my_sed_single_rest"`
-                       opt=`echo "$opt" |$SED "$my_sed_single_opt"`
-                       set -- "$opt" "$arg" ${1+"$@"}
-                       ;;
-
       -f|--force)      vcs_only_file=                                  ;;
+      --skip-po)       SKIP_PO=t                                       ;;
       -\?|-h)          func_usage                                      ;;
       --help)          func_help                                       ;;
       --version)       func_version                                    ;;
@@ -254,76 +226,68 @@ func_update ()
   fi
 }
 
-## ------------------------------ ##
-## Fetch translations.            ##
-## (taken from GNU tar bootstrap) ##
-## ------------------------------ ##
+## --------------------------------------- ##
+## Fetch translations.                     ##
+## (taken from gnulib build-aux/bootstrap) ##
+## --------------------------------------- ##
+
+# The command to download all .po files for a specified domain into
+# a specified directory.  Fill in the first %s with the domain name,
+# the second with the destination directory.  Use rsync's -L and -r
+# options because the latest/%s directory and the .po files within
+# are all symlinks.
+po_download_command_format=\
+"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
 
 func_get_translations()
 {
   subdir=$1
   domain=$2
-  po_file=$3
-
-  url=http://translationproject.org/domain/$2.html
-  baseurl=`expr "$url" : '\(.*\)/.*'`
 
   func_echo "getting translations into $subdir for $domain..."
-
-  case $po_file in
-    '') (cd $subdir && rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'`);;
-  esac &&
-
-  $WGET -nv --cache=off -O "$subdir/$domain.html" "$url" &&
-
-  sed -n 
's|.*href="\(.*\)/\([^/][^/]*\)/'"$domain"'-\([^/"]*\)\.[^."]*\.po".*|\2:\3:\1|p'
 <"$subdir/$domain.html" |
-  sort -t: -k 1,1 -k 2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 -k5,5n -k5.5 |
-  $AWK -F: '
-    { if (lang && $1 != lang) print lang, ver, subdir }
-    { lang = $1; ver = $2; subdir = $3 }
-    END { if (lang) print lang, ver, subdir }
-  ' | $AWK -v domain="$domain" -v po_file="$po_file" -v baseurl="$baseurl" -v 
subdir="$subdir" '
-    {
-      lang = $1
-      if (po_file == (lang ".po")) next
-
-      ver = $2
-      urlfmt = ""
-      printf "$WGET -nv --cache=off -O %s/%s.po %s/%s/%s/%s-%s.%s.po &&\n", 
subdir, lang, baseurl, $3, lang, domain, ver, lang
-    }
-    END { print ":" }
-  ' |
-  sh &&
-  ls "$subdir"/*.po | sed 's|.*/||; s|\.po$||' >"$subdir/LINGUAS" &&
-  rm "$subdir/$domain.html"
+  cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
+  eval "$cmd"
 }
 
-## ------------------------------ ##
-## Update translations.           ##
-## (taken from GNU tar bootstrap) ##
-## ------------------------------ ##
+## --------------------------------------- ##
+## Update translations.                    ##
+## (taken from gnulib build-aux/bootstrap) ##
+## --------------------------------------- ##
 
 func_update_po ()
 {
-    if test $# = 1; then
-      case $1 in
-       *.po)  POFILE=$1    ;;
-       *)     POFILE=$1.po ;;
-      esac
-      func_get_translations ./po $package "$POFILE" &&
-      LANG=`expr $POFILE : '\(.*\)\.po'` &&
-      { grep -q $LANG po/LINGUAS ||
-       (echo $LANG; cat po/LINGUAS) | sort -o po/LINGUAS; }
-    else
-      func_get_translations ./po $package
+  # Directory containing primary .po files.
+  # Overwrite them only when we're sure a .po file is new.
+  po_dir=po
+  domain=$package
+
+  # Download *.po files into this dir.
+  # Usually contains *.s1 checksum files.
+  ref_po_dir="$po_dir/.reference"
+
+  test -d $ref_po_dir || mkdir $ref_po_dir || return
+
+  func_get_translations $ref_po_dir $domain \
+    && ls "$ref_po_dir"/*.po 2>/dev/null \
+       | sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
+  langs=`cd $ref_po_dir && echo *.po | sed 's/\.po//g'`
+
+  test "$langs" = '*' && langs=x
+  for po in $langs; do
+    case $po in x) continue;; esac
+    new_po="$ref_po_dir/$po.po"
+    cksum_file="$ref_po_dir/$po.s1"
+    if ! test -f "$cksum_file" ||
+       ! test -f "$po_dir/$po.po" ||
+       ! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then
+      echo "updated $po_dir/$po.po..."
+      cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file"
     fi
+  done
 }
 
-case $DOWNLOAD_PO in
-  no)   ;;
-  only) func_update_po; exit 0 ;;
-  yes)  func_update_po ;;
-  *)    func_update_po $DOWNLOAD_PO ;;
+case $SKIP_PO in
+  '')  func_update_po ;;
 esac
 
 ## ---------------- ##
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 3540710..1c7e4ef 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -2792,8 +2792,12 @@ builtin(`builtin')
 builtin(`builtin',)
 @error{}m4:stdin:4: Warning: builtin: undefined builtin `'
 @result{}
+builtin(`builtin', ``'
+')
address@hidden:stdin:5: Warning: builtin: undefined builtin ``\'\n'
address@hidden
 indir(`index')
address@hidden:stdin:5: Warning: index: too few arguments: 0 < 2
address@hidden:stdin:7: Warning: index: too few arguments: 0 < 2
 @result{}0
 @end example
 
@@ -2850,10 +2854,19 @@ traceoff
 changequote(`[', `]')
 @result{}
 defn1([foo])
address@hidden:stdin:11: Warning: builtin: undefined builtin ``defn''
address@hidden:stdin:11: Warning: builtin: undefined builtin ``defn\''
 @result{}
 defn2([foo])
 @result{}bar
+define([defn1], [builtin([defn], $@@)])
address@hidden
+defn1([foo])
address@hidden
+changequote
address@hidden
+defn1(`foo')
address@hidden:stdin:16: Warning: builtin: undefined builtin `[defn]'
address@hidden
 @end example
 
 @node M4symbols
diff --git a/m4/m4module.h b/m4/m4module.h
index 346463d..29495f3 100644
--- a/m4/m4module.h
+++ b/m4/m4module.h
@@ -167,7 +167,7 @@ struct m4_string_pair
    `m4_macro_args *argv' are in scope.  */
 #define M4ARGLEN(i) m4_arg_len (context, argv, i)
 
-extern bool    m4_bad_argc        (m4 *, int, const m4_call_info *, size_t,
+extern bool    m4_bad_argc        (m4 *, size_t, const m4_call_info *, size_t,
                                    size_t, bool);
 extern bool    m4_numeric_arg     (m4 *, const m4_call_info *, const char *,
                                    int *);
diff --git a/m4/m4private.h b/m4/m4private.h
index e1c8163..9734a16 100644
--- a/m4/m4private.h
+++ b/m4/m4private.h
@@ -341,7 +341,7 @@ struct m4_call_info
 {
   const char *file;    /* The file containing the macro invocation.  */
   int line;            /* The line the macro was called on.  */
-  int call_id;         /* The unique sequence call id of the macro.  */
+  size_t call_id;      /* The unique sequence call id of the macro.  */
   int trace : 1;       /* True to trace this macro.  */
   int debug_level : 31;        /* The debug level for tracing the macro call.  
*/
   const char *name;    /* The macro name.  */
diff --git a/m4/macro.c b/m4/macro.c
index 1436ea9..b1f9f44 100644
--- a/m4/macro.c
+++ b/m4/macro.c
@@ -526,7 +526,7 @@ recursion limit of %zu exceeded, use -L<N> to change it"),
        {
          obstack_free (stack->args, args_scratch);
          if (debug_macro_level & PRINT_ARGCOUNT_CHANGES)
-           xfprintf (stderr, "m4debug: -%d- `%s' in use, level=%d, "
+           xfprintf (stderr, "m4debug: -%zu- `%s' in use, level=%zu, "
                      "refcount=%zu, argcount=%zu\n", info.call_id,
                      argv->info->name, level, stack->refcount,
                      stack->argcount);
@@ -980,13 +980,13 @@ m4__adjust_refcount (m4 *context, size_t level, bool 
increase)
       obstack_free (stack->args, stack->args_base);
       obstack_free (stack->argv, stack->argv_base);
       if ((debug_macro_level & PRINT_ARGCOUNT_CHANGES) && 1 < stack->argcount)
-       xfprintf (stderr, "m4debug: -%d- freeing %zu args, level=%d\n",
+       xfprintf (stderr, "m4debug: -%zu- freeing %zu args, level=%zu\n",
                  macro_call_id, stack->argcount, level);
       stack->argcount = 0;
     }
   if (debug_macro_level
       & (increase ? PRINT_REFCOUNT_INCREASE : PRINT_REFCOUNT_DECREASE))
-    xfprintf (stderr, "m4debug: level %d refcount=%d\n", level,
+    xfprintf (stderr, "m4debug: level %zu refcount=%zu\n", level,
              stack->refcount);
   return stack->refcount;
 }
diff --git a/m4/utility.c b/m4/utility.c
index c104779..596c621 100644
--- a/m4/utility.c
+++ b/m4/utility.c
@@ -41,19 +41,19 @@ static const char *skip_space (m4 *, const char *);
    Return true if the macro is guaranteed to expand to the empty
    string, false otherwise.  */
 bool
-m4_bad_argc (m4 *context, int argc, const m4_call_info *caller, size_t min,
+m4_bad_argc (m4 *context, size_t argc, const m4_call_info *caller, size_t min,
             size_t max, bool side_effect)
 {
   if (argc - 1 < min)
     {
-      m4_warn (context, 0, caller, _("too few arguments: %d < %d"),
+      m4_warn (context, 0, caller, _("too few arguments: %zu < %zu"),
               argc - 1, min);
       return !side_effect;
     }
 
   if (argc - 1 > max)
     {
-      m4_warn (context, 0, caller, _("extra arguments ignored: %d > %d"),
+      m4_warn (context, 0, caller, _("extra arguments ignored: %zu > %zu"),
               argc - 1, max);
     }
 
diff --git a/po/.cvsignore b/po/.cvsignore
index 3796311..e1311ac 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -5,6 +5,7 @@
 *.po
 *.pot
 *.sin
+.reference
 boldquot.sed
 cat-id-tbl.c
 LINGUAS
diff --git a/po/.gitignore b/po/.gitignore
index 3796311..e1311ac 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -5,6 +5,7 @@
 *.po
 *.pot
 *.sin
+.reference
 boldquot.sed
 cat-id-tbl.c
 LINGUAS


hooks/post-receive
--
GNU M4 source repository