[gawk-diffs] [SCM] gawk branch, master, updated. 4122d7e4464e65a4626ff638ba9c77241cf66de3

[Arnold Robbins]

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 "gawk".

The branch, master has been updated
       via  4122d7e4464e65a4626ff638ba9c77241cf66de3 (commit)
       via  8b50259289e066f9a265a90a8aa81ada16da4065 (commit)
      from  320be29f61ef7b61596f5fcd8e3568aebe0918a0 (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 -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=4122d7e4464e65a4626ff638ba9c77241cf66de3

commit 4122d7e4464e65a4626ff638ba9c77241cf66de3
Author: Arnold D. Robbins <address@hidden>
Date:   Tue Apr 16 12:58:26 2013 +0300

    Update POTFILES.in.

diff --git a/po/ChangeLog b/po/ChangeLog
index 6a31a05..a198b8c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-16         Arnold D. Robbins     <address@hidden>
+
+       * POTFILES.in: Brought up to date.
+
 2012-12-24         Arnold D. Robbins     <address@hidden>
 
        * 4.0.2: Release tar ball made.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f62ba39..63461e7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,7 +13,9 @@ ext.c
 extension/filefuncs.c
 extension/fnmatch.c
 extension/fork.c
+extension/inplace.c
 extension/ordchr.c
+extension/readdir.c
 extension/readfile.c
 extension/rwarray.c
 extension/time.c

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=8b50259289e066f9a265a90a8aa81ada16da4065

commit 8b50259289e066f9a265a90a8aa81ada16da4065
Author: Arnold D. Robbins <address@hidden>
Date:   Tue Apr 16 12:58:07 2013 +0300

    Update getopt from glibc.

diff --git a/ChangeLog b/ChangeLog
index fb86f3d..0b71c91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
        * configure, Makefile.in, aclocal.m4, awklib/Makefile.in,
        doc/Makefile.in, test/Makefile.in: Regenerated.
 
+       * getopt.c, getopt.h, getopt1.c, getopt_int.h: Sync with GLIBC.
+
 2013-04-14         Arnold D. Robbins     <address@hidden>
 
        * awkgram.y (check_funcs): Fix logic of test for called but
diff --git a/getopt.c b/getopt.c
index d0996d4..e27848d 100644
--- a/getopt.c
+++ b/getopt.c
@@ -2,8 +2,7 @@
    NOTE: getopt is part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to address@hidden
    before changing it!
-   Copyright (C) 1987-1996,1998-2004,2008,2009,2010,2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1987-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -614,19 +613,19 @@ _getopt_internal_r (int argc, char *const *argv, const 
char *optstring,
                  fputc_unlocked ('\n', fp);
 
                  if (__builtin_expect (fclose (fp) != EOF, 1))
-               {
-                 _IO_flockfile (stderr);
+                   {
+                     _IO_flockfile (stderr);
 
-                 int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-                 ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+                     int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                     ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-                 __fxprintf (NULL, "%s", buf);
+                     __fxprintf (NULL, "%s", buf);
 
-                 ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-                 _IO_funlockfile (stderr);
+                     ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                     _IO_funlockfile (stderr);
 
-                 free (buf);
-               }
+                     free (buf);
+                   }
                }
 #else
              fprintf (stderr,
@@ -1106,8 +1105,8 @@ _getopt_internal_r (int argc, char *const *argv, const 
char *optstring,
          }
 
       no_longs:
-         d->__nextchar = NULL;
-         return 'W';   /* Let the application handle it.   */
+       d->__nextchar = NULL;
+       return 'W';     /* Let the application handle it.   */
       }
     if (temp[1] == ':')
       {
diff --git a/getopt.h b/getopt.h
index 82d0ab9..5d19cb3 100644
--- a/getopt.h
+++ b/getopt.h
@@ -1,6 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009,2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1989-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -158,7 +157,7 @@ extern int getopt (int ___argc, char *const *___argv, const 
char *__shortopts)
    helps to also do this at runtime.  */
 #  ifdef __REDIRECT
   extern int __REDIRECT_NTH (getopt, (int ___argc, char *const *___argv,
-                                 const char *__shortopts),
+                                     const char *__shortopts),
                             __posix_getopt);
 #  else
 extern int __posix_getopt (int ___argc, char *const *___argv,
diff --git a/getopt1.c b/getopt1.c
index 03fba35..8be9657 100644
--- a/getopt1.c
+++ b/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-1994,1996-1998,2004,2009 Free Software Foundation, Inc.
+   Copyright (C) 1987-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/getopt_int.h b/getopt_int.h
index b0d7695..92f3871 100644
--- a/getopt_int.h
+++ b/getopt_int.h
@@ -1,6 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1989-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or

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

Summary of changes:
 ChangeLog      |    2 ++
 getopt.c       |   25 ++++++++++++-------------
 getopt.h       |    5 ++---
 getopt1.c      |    2 +-
 getopt_int.h   |    3 +--
 po/ChangeLog   |    4 ++++
 po/POTFILES.in |    2 ++
 7 files changed, 24 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
gawk