提交 63dbc84a 编写于 作者: E Eric Blake

maint: improve sc_prohibit_strncmp syntax check

* .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.
上级 d9b04947
.gnulib @ 97790558
Subproject commit 4f2c339efdaf1fcca9eed7b0700083b5e24942d4 Subproject commit 9779055889c2715b593930e39ead552759b5ddc2
...@@ -33,8 +33,6 @@ syntax_check_exceptions = \ ...@@ -33,8 +33,6 @@ syntax_check_exceptions = \
.x-sc_prohibit_nonreentrant \ .x-sc_prohibit_nonreentrant \
.x-sc_prohibit_readlink \ .x-sc_prohibit_readlink \
.x-sc_prohibit_sprintf \ .x-sc_prohibit_sprintf \
.x-sc_prohibit_strcmp \
.x-sc_prohibit_strncmp \
.x-sc_prohibit_strncpy \ .x-sc_prohibit_strncpy \
.x-sc_prohibit_test_minus_ao \ .x-sc_prohibit_test_minus_ao \
.x-sc_prohibit_VIR_ERR_NO_MEMORY \ .x-sc_prohibit_VIR_ERR_NO_MEMORY \
......
# Customize Makefile.maint. -*- makefile -*- # 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 # 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 # it under the terms of the GNU General Public License as published by
...@@ -250,9 +251,9 @@ sc_prohibit_close: ...@@ -250,9 +251,9 @@ sc_prohibit_close:
# Similar to the gnulib maint.mk rule for sc_prohibit_strcmp # Similar to the gnulib maint.mk rule for sc_prohibit_strcmp
# Use STREQLEN or STRPREFIX rather than comparing strncmp == 0, or != 0. # Use STREQLEN or STRPREFIX rather than comparing strncmp == 0, or != 0.
sc_prohibit_strncmp: sc_prohibit_strncmp:
@grep -nE '! *str''ncmp *\(|\<str''ncmp *\([^)]+\) *==' \ @grep -nE '! *str''ncmp *\(|\<str''ncmp *\(.+\) *[!=]=' \
$$($(VC_LIST_EXCEPT)) \ $$($(VC_LIST_EXCEPT)) \
| grep -vE ':# *define STREQ\(' && \ | grep -vE ':# *define STR(N?EQLEN|PREFIX)\(' && \
{ echo '$(ME): use STREQLEN or STRPREFIX instead of str''ncmp' \ { echo '$(ME): use STREQLEN or STRPREFIX instead of str''ncmp' \
1>&2; exit 1; } || : 1>&2; exit 1; } || :
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册