Re: mkdir vs. GPL

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[moving to bug-coreutils]

According to Eric Blake on 10/30/2009 5:51 AM:
> Actually, I thought of one other solution, after sleeping on the problem.
>   Any client (like coreutils) that wants to continue using gnulib-tool
> --avoid=canonicalize-lgpl merely needs to also provide a gnulib override
> for modules/rename-tests.diff that re-adds the @LIBINTL@ designation to
> LDADD for that test to resume linking on cygwin 1.5.  I'll post a patch to
> coreutils soon.

With this patch, and a bump to the latest gnulib[*], I can (once again)
compile coreutils on cygwin 1.5 with --enable-gcc-warnings.  Does it look
okay to commit, once gnulib falls into place?

[*] Well, technically, this patch assumed that my proposed patch for
vasnprintf variable shadowing will be picked up; I'm still waiting for
Bruno on that one.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             ebb9@...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkrrjCUACgkQ84KuGfSFAYB7zQCgmevJDHGI5wednv5jwZrwThQ1
jXMAn0+tK3B4uIvNoMIboouYF4sn+Jj+
=56N+
-----END PGP SIGNATURE-----

From 8f7e4a7505cf2fc4b0d79445fc665513ecee76d7 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@...>
Date: Fri, 30 Oct 2009 18:58:58 -0600
Subject: [PATCH] build: avoid some warnings

* gl/lib/mbsalign.c (mbsalign): Mark unused parameter.
* bootstrap.conf (gnulib_modules): Remove obsolete
rename-dest-slash.
* gnulib-tests/Makefile.am (AM_CFLAGS): Reduce set of warnings for
gnulib tests.
* gl/modules/rename-tests.diff (Makefile.am): New file, to add
LIBINTL to LDADD, since we avoid canonicalize-lgpl module.
* gl/lib/regcomp.c.diff (regerror, calc_next)
(build_collating_symbol, parse_bracket_element, build_equiv_class)
(free_tree): Mark unused parameters.
* gl/lib/regex_internal.h.diff (re_string_elem_size_at): New file,
to mark unused parameters.
* .gitignore: Ignore temporary build artifacts.
---
 .gitignore                   |    1 +
 bootstrap.conf               |    1 -
 gl/lib/mbsalign.c            |    2 +-
 gl/lib/regcomp.c.diff        |   67 +++++++++++++++++++++++++++++++++++++++--
 gl/lib/regex_internal.h.diff |   14 +++++++++
 gl/modules/rename-tests.diff |    9 +++++
 gnulib-tests/Makefile.am     |    2 +-
 7 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 gl/lib/regex_internal.h.diff
 create mode 100644 gl/modules/rename-tests.diff

diff --git a/.gitignore b/.gitignore
index a284154..8d1370f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.o
 */.deps
 *~
+._bootmp
 .gdb-history
 .kludge-stamp
 .tarball-version
diff --git a/bootstrap.conf b/bootstrap.conf
index 4c0f4c7..7960546 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -181,7 +181,6 @@ gnulib_modules="
   realloc
   regex
   rename
-  rename-dest-slash
   rmdir
   root-dev-ino
   rpmatch
diff --git a/gl/lib/mbsalign.c b/gl/lib/mbsalign.c
index a075747..b9d7e52 100644
--- a/gl/lib/mbsalign.c
+++ b/gl/lib/mbsalign.c
@@ -129,7 +129,7 @@ mbs_align_pad (char *dest, const char* dest_end, size_t n_spaces)

 size_t
 mbsalign (const char *src, char *dest, size_t dest_size,
-          size_t *width, mbs_align_t align, int flags)
+          size_t *width, mbs_align_t align, int flags _UNUSED_PARAMETER_)
 {
   size_t ret = -1;
   size_t src_size = strlen (src) + 1;
diff --git a/gl/lib/regcomp.c.diff b/gl/lib/regcomp.c.diff
index 88097a4..a31c39f 100644
--- a/gl/lib/regcomp.c.diff
+++ b/gl/lib/regcomp.c.diff
@@ -1,7 +1,7 @@
-diff --git a/lib/regcomp.c b/lib/regcomp.c
-index 6472ff6..fadf36d 100644
---- a/lib/regcomp.c
-+++ b/lib/regcomp.c
+diff --git c/lib/regcomp.c i/lib/regcomp.c
+index 6472ff6..665b2ab 100644
+--- c/lib/regcomp.c
++++ i/lib/regcomp.c
 @@ -18,6 +18,8 @@
     with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
@@ -11,6 +11,24 @@ index 6472ff6..fadf36d 100644
  static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
   size_t length, reg_syntax_t syntax);
  static void re_compile_fastmap_iter (regex_t *bufp,
+@@ -541,7 +543,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
+     size_t errbuf_size;
+ #else /* size_t might promote */
+ size_t
+-regerror (int errcode, const regex_t *_Restrict_ preg,
++regerror (int errcode, const regex_t *_Restrict_ preg _UNUSED_PARAMETER_,
+  char *_Restrict_ errbuf, size_t errbuf_size)
+ #endif
+ {
+@@ -1375,7 +1377,7 @@ calc_first (void *extra, bin_tree_t *node)
+
+ /* Pass 2: compute NEXT on the tree.  Preorder visit.  */
+ static reg_errcode_t
+-calc_next (void *extra, bin_tree_t *node)
++calc_next (void *extra _UNUSED_PARAMETER_, bin_tree_t *node)
+ {
+   switch (node->token.type)
+     {
 @@ -2571,7 +2573,8 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
    /* This loop is actually executed only when end != REG_MISSING,
       to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?...  We have
@@ -21,3 +39,44 @@ index 6472ff6..fadf36d 100644
      for (i = start + 2; i <= end; ++i)
        {
  elem = duplicate_tree (elem, dfa);
+@@ -2731,7 +2734,8 @@ static reg_errcode_t
+ internal_function
+ build_collating_symbol (bitset_t sbcset,
+ # ifdef RE_ENABLE_I18N
+- re_charset_t *mbcset, Idx *coll_sym_alloc,
++ re_charset_t *mbcset _UNUSED_PARAMETER_,
++ Idx *coll_sym_alloc _UNUSED_PARAMETER_,
+ # endif
+ const unsigned char *name)
+ {
+@@ -3309,7 +3313,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
+
+ static reg_errcode_t
+ parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp,
+-       re_token_t *token, int token_len, re_dfa_t *dfa,
++       re_token_t *token, int token_len,
++       re_dfa_t *dfa _UNUSED_PARAMETER_,
+       reg_syntax_t syntax, bool accept_hyphen)
+ {
+ #ifdef RE_ENABLE_I18N
+@@ -3396,8 +3401,9 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
+
+ static reg_errcode_t
+ #ifdef RE_ENABLE_I18N
+-build_equiv_class (bitset_t sbcset, re_charset_t *mbcset,
+-   Idx *equiv_class_alloc, const unsigned char *name)
++build_equiv_class (bitset_t sbcset, re_charset_t *mbcset _UNUSED_PARAMETER_,
++   Idx *equiv_class_alloc _UNUSED_PARAMETER_,
++   const unsigned char *name)
+ #else /* not RE_ENABLE_I18N */
+ build_equiv_class (bitset_t sbcset, const unsigned char *name)
+ #endif /* not RE_ENABLE_I18N */
+@@ -3798,7 +3804,7 @@ free_token (re_token_t *node)
+    and its children. */
+
+ static reg_errcode_t
+-free_tree (void *extra, bin_tree_t *node)
++free_tree (void *extra _UNUSED_PARAMETER_, bin_tree_t *node)
+ {
+   free_token (&node->token);
+   return REG_NOERROR;
diff --git a/gl/lib/regex_internal.h.diff b/gl/lib/regex_internal.h.diff
new file mode 100644
index 0000000..d1506a6
--- /dev/null
+++ b/gl/lib/regex_internal.h.diff
@@ -0,0 +1,14 @@
+diff --git i/lib/regex_internal.h w/lib/regex_internal.h
+index 859832f..3c7fe06 100644
+--- i/lib/regex_internal.h
++++ w/lib/regex_internal.h
+@@ -826,7 +826,8 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx)
+
+ static int
+ internal_function __attribute ((pure))
+-re_string_elem_size_at (const re_string_t *pstr, Idx idx)
++re_string_elem_size_at (const re_string_t *pstr _UNUSED_PARAMETER_,
++ Idx idx _UNUSED_PARAMETER_)
+ {
+ # ifdef _LIBC
+   const unsigned char *p, *extra;
diff --git a/gl/modules/rename-tests.diff b/gl/modules/rename-tests.diff
new file mode 100644
index 0000000..7f1ff61
--- /dev/null
+++ b/gl/modules/rename-tests.diff
@@ -0,0 +1,9 @@
+diff --git a/modules/rename-tests b/modules/rename-tests
+index be1b423..fea330a 100644
+--- a/modules/rename-tests
++++ b/modules/rename-tests
+@@ -14,3 +14,4 @@ configure.ac:
+ Makefile.am:
+ TESTS += test-rename
+ check_PROGRAMS += test-rename
++test_rename_LDADD = $(LDADD) @LIBINTL@
diff --git a/gnulib-tests/Makefile.am b/gnulib-tests/Makefile.am
index 494786f..c3a48e8 100644
--- a/gnulib-tests/Makefile.am
+++ b/gnulib-tests/Makefile.am
@@ -1,3 +1,3 @@
 include gnulib.mk

-AM_CFLAGS = $(WARN_CFLAGS) # $(WERROR_CFLAGS)
+AM_CFLAGS = $(GNULIB_WARN_CFLAGS) # $(WERROR_CFLAGS)
--
1.6.5.rc1

[Jim Meyering]

Eric Blake wrote:

> [moving to bug-coreutils]
>
> According to Eric Blake on 10/30/2009 5:51 AM:
>> Actually, I thought of one other solution, after sleeping on the problem.
>>   Any client (like coreutils) that wants to continue using gnulib-tool
>> --avoid=canonicalize-lgpl merely needs to also provide a gnulib override
>> for modules/rename-tests.diff that re-adds the @LIBINTL@ designation to
>> LDADD for that test to resume linking on cygwin 1.5.  I'll post a patch to
>> coreutils soon.
>
> With this patch, and a bump to the latest gnulib[*], I can (once again)
> compile coreutils on cygwin 1.5 with --enable-gcc-warnings.  Does it look
> okay to commit, once gnulib falls into place?

This looks fine.  Test writers will thank you.
Push at will.

> [*] Well, technically, this patch assumed that my proposed patch for
> vasnprintf variable shadowing will be picked up; I'm still waiting for
> Bruno on that one.
...

> Subject: [PATCH] build: avoid some warnings
>
> * gl/lib/mbsalign.c (mbsalign): Mark unused parameter.
> * bootstrap.conf (gnulib_modules): Remove obsolete
> rename-dest-slash.
> * gnulib-tests/Makefile.am (AM_CFLAGS): Reduce set of warnings for
> gnulib tests.
> * gl/modules/rename-tests.diff (Makefile.am): New file, to add
> LIBINTL to LDADD, since we avoid canonicalize-lgpl module.
> * gl/lib/regcomp.c.diff (regerror, calc_next)
> (build_collating_symbol, parse_bracket_element, build_equiv_class)
> (free_tree): Mark unused parameters.
> * gl/lib/regex_internal.h.diff (re_string_elem_size_at): New file,
> to mark unused parameters.
> * .gitignore: Ignore temporary build artifacts.

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Jim Meyering on 10/31/2009 1:57 AM:
>> With this patch, and a bump to the latest gnulib[*], I can (once again)
>> compile coreutils on cygwin 1.5 with --enable-gcc-warnings.  Does it look
>> okay to commit, once gnulib falls into place?
>
> This looks fine.  Test writers will thank you.
> Push at will.

I would, except:

> ...
> gl/lib/vasnprintf.c.diff:120: space before tab in indent.
> + }
> error: hooks/update exited with error code 2
> error: hook declined to update refs/heads/master
> To ericb@...:/srv/git/coreutils.git
>  ! [remote rejected] master -> master (hook declined)

Any way we can relax the server hook for gl/*/*.diff, to match the fact
that .gitattributes already marks those files as non-whitespace?

- --
Don't work too hard, make some time for fun as well!

Eric Blake             ebb9@...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkrvptYACgkQ84KuGfSFAYCtkACfXmowPG3F+T1iYg19Z9nbQT8M
SxAAoMkqvQxxc9DHOXn/19pkz+tdw2ZH
=oJyK
-----END PGP SIGNATURE-----

[Jim Meyering]

Eric Blake wrote:

> According to Jim Meyering on 10/31/2009 1:57 AM:
>>> With this patch, and a bump to the latest gnulib[*], I can (once again)
>>> compile coreutils on cygwin 1.5 with --enable-gcc-warnings.  Does it look
>>> okay to commit, once gnulib falls into place?
>>
>> This looks fine.  Test writers will thank you.
>> Push at will.
>
> I would, except:
>
>> ...
>> gl/lib/vasnprintf.c.diff:120: space before tab in indent.
>> + }
>> error: hooks/update exited with error code 2
>> error: hook declined to update refs/heads/master
>> To ericb@...:/srv/git/coreutils.git
>>  ! [remote rejected] master -> master (hook declined)
>
> Any way we can relax the server hook for gl/*/*.diff, to match the fact
> that .gitattributes already marks those files as non-whitespace?

I've just created this on the server:

    $ cat /vservers/vcs-noshell/srv/git/coreutils.git/info/attributes
    *.diff -whitespace