* .gnulib: Update, for sc_prohibit_strcmp fix. * cfg.mk: Adjust copyright; the only FSF portions come from when this file was copied from coreutils. (sc_prohibit_strncmp): Copy bug-fixes from sc_prohibit_strcmp. * .x-sc_prohibit_strcmp: Delete, now that rule is smarter. * .x-sc_prohibit_strncmp: Likewise. * Makefile.am (syntax_check_exceptions): Track deletion. --- This patch would have flagged Diego's use of strncmp in commandtest.c, and will help us catch any future violations of a similar nature. I love it when a patch removes more than it adds and still fixes bugs. * .gnulib 4f2c339...939dedd (10): .gnulib | 2 +- .x-sc_prohibit_strcmp | 1 - .x-sc_prohibit_strncmp | 1 - Makefile.am | 2 -- cfg.mk | 7 ++++--- 5 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 .x-sc_prohibit_strcmp delete mode 100644 .x-sc_prohibit_strncmp diff --git a/.gnulib b/.gnulib index 4f2c339..939dedd 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 4f2c339efdaf1fcca9eed7b0700083b5e24942d4 +Subproject commit 939dedd9a2fba934e5ff0313155f9f5f39cb6f6f diff --git a/.x-sc_prohibit_strcmp b/.x-sc_prohibit_strcmp deleted file mode 100644 index b7c456e..0000000 --- a/.x-sc_prohibit_strcmp +++ /dev/null @@ -1 +0,0 @@ -^gnulib/ diff --git a/.x-sc_prohibit_strncmp b/.x-sc_prohibit_strncmp deleted file mode 100644 index 8be2055..0000000 --- a/.x-sc_prohibit_strncmp +++ /dev/null @@ -1 +0,0 @@ -^src/internal\.h$ diff --git a/Makefile.am b/Makefile.am index c525e65..36463f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,8 +33,6 @@ syntax_check_exceptions = \ .x-sc_prohibit_nonreentrant \ .x-sc_prohibit_readlink \ .x-sc_prohibit_sprintf \ - .x-sc_prohibit_strcmp \ - .x-sc_prohibit_strncmp \ .x-sc_prohibit_strncpy \ .x-sc_prohibit_test_minus_ao \ .x-sc_prohibit_VIR_ERR_NO_MEMORY \ diff --git a/cfg.mk b/cfg.mk index 03186b3..e67315b 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,5 +1,6 @@ # Customize Makefile.maint. -*- makefile -*- -# Copyright (C) 2003-2010 Free Software Foundation, Inc. +# Copyright (C) 2008-2011 Red Hat, Inc. +# Copyright (C) 2003-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -249,9 +250,9 @@ sc_prohibit_close: # Similar to the gnulib maint.mk rule for sc_prohibit_strcmp # Use STREQLEN or STRPREFIX rather than comparing strncmp == 0, or != 0. sc_prohibit_strncmp: - @grep -nE '! *str''ncmp *\(|\<str''ncmp *\([^)]+\) *==' \ + @grep -nE '! *str''ncmp *\(|\<str''ncmp *\(.+\) *[!=]=' \ $$($(VC_LIST_EXCEPT)) \ - | grep -vE ':# *define STREQ\(' && \ + | grep -vE ':# *define STR(N?EQLEN|PREFIX)\(' && \ { echo '$(ME): use STREQLEN or STRPREFIX instead of str''ncmp' \ 1>&2; exit 1; } || : -- 1.7.3.4