[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-idutils] FYI, misc build/maint/tests patches:
|
From: |
Jim Meyering |
|
Subject: |
[bug-idutils] FYI, misc build/maint/tests patches: |
|
Date: |
Sun, 20 Mar 2011 10:55:52 +0100 |
>From fbadd79a7a789e36cf398929ec17f6dbc7f77ede Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 3 Jan 2011 21:59:17 +0100
Subject: [PATCH 1/8] build: update gnulib submodule to latest
---
gnulib | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gnulib b/gnulib
index 9f0cd59..a2e8447 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 9f0cd590f76f5e5e942fbd90b253c90ca7c80699
+Subproject commit a2e8447d6b8abe23504f4f2d4757a60a2e8bee54
--
1.7.4.1.499.g53f9
>From 9de5c91f05c8e04bb3aec26dd29f72a32bdb6b46 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 3 Jan 2011 22:02:51 +0100
Subject: [PATCH 2/8] maint: update copyright year ranges to include 2011
Run "make update-copyright".
---
NEWS | 2 +-
README-hacking | 2 +-
bootstrap | 2 +-
bootstrap.conf | 2 +-
cfg.mk | 2 +-
doc/idutils.texi | 2 +-
gnulib | 2 +-
lib/Makefile.am | 2 +-
libidu/dynvec.c | 2 +-
libidu/dynvec.h | 2 +-
libidu/fnprint.c | 2 +-
libidu/idfile.c | 2 +-
libidu/idfile.h | 2 +-
libidu/idread.c | 2 +-
libidu/idu-hash.c | 2 +-
libidu/idu-hash.h | 2 +-
libidu/iduglobal.h | 2 +-
libidu/idwrite.c | 2 +-
libidu/scanners.c | 2 +-
libidu/scanners.h | 2 +-
libidu/tokflags.h | 2 +-
libidu/walker.c | 2 +-
libidu/xnls.h | 2 +-
lisp/idutils.el | 2 +-
src/fid.c | 2 +-
src/fnid.c | 2 +-
src/lid.c | 2 +-
src/mkid.c | 2 +-
src/xtokid.c | 2 +-
testsuite/Coreutils.pm | 2 +-
testsuite/CuTmpdir.pm | 2 +-
testsuite/check.mk | 2 +-
testsuite/consistency | 2 +-
testsuite/envvar-check | 2 +-
testsuite/files0-from | 2 +-
testsuite/help-version | 2 +-
testsuite/infloop-kawa-el | 2 +-
testsuite/init.sh | 2 +-
38 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/NEWS b/NEWS
index b8e618e..251b296 100644
--- a/NEWS
+++ b/NEWS
@@ -206,7 +206,7 @@ Version 1.0 - September 1987, by Greg McGary
* Initial release to comp.sources.unix
-Copyright (C) 2001-2010 Free Software Foundation, Inc.
+Copyright (C) 2001-2011 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/README-hacking b/README-hacking
index 6cbe384..db3f45c 100644
--- a/README-hacking
+++ b/README-hacking
@@ -70,7 +70,7 @@ Enjoy!
-----
-Copyright (C) 2002-2010 Free Software Foundation, Inc.
+Copyright (C) 2002-2011 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
diff --git a/bootstrap b/bootstrap
index 2422549..44644fc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,7 @@ scriptversion=2010-05-17.18; # UTC
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003-2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-2011 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
diff --git a/bootstrap.conf b/bootstrap.conf
index 483e509..a3d5637 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
# Bootstrap configuration.
-# Copyright (C) 2006-2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2011 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
diff --git a/cfg.mk b/cfg.mk
index bb4d9bf..777e928 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
# Customize maint.mk. -*- makefile -*-
-# Copyright (C) 2003-2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-2011 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
diff --git a/doc/idutils.texi b/doc/idutils.texi
index 29fd44b..87a1f85 100644
--- a/doc/idutils.texi
+++ b/doc/idutils.texi
@@ -36,7 +36,7 @@ END-INFO-DIR-ENTRY
@copying
This file documents the @file{idutils} database utilities.
-Copyright @copyright{} 1996, 1999-2000, 2008-2010 Free Software Foundation,
+Copyright @copyright{} 1996, 1999-2000, 2008-2011 Free Software Foundation,
Inc.
@quotation
diff --git a/gnulib b/gnulib
index a2e8447..739321e 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit a2e8447d6b8abe23504f4f2d4757a60a2e8bee54
+Subproject commit 739321ef60661c7b51a4c7a3fa23957a4d9dbbc3
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1cb87e2..0b4482e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2004-2007, 2009-2010 Free Software Foundation, Inc.
+# Copyright (C) 2004-2007, 2009-2011 Free Software Foundation, Inc.
#
# This file is free software, distributed under the terms of the GNU
# General Public License. As a special exception to the GNU General
diff --git a/libidu/dynvec.c b/libidu/dynvec.c
index 0388fb1..b8fe044 100644
--- a/libidu/dynvec.c
+++ b/libidu/dynvec.c
@@ -1,5 +1,5 @@
/* dynvec.c -- dynamically growable vectors
- Copyright (C) 1995, 2007-2010 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2007-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/dynvec.h b/libidu/dynvec.h
index 7122adc..b997a64 100644
--- a/libidu/dynvec.h
+++ b/libidu/dynvec.h
@@ -1,5 +1,5 @@
/* dynvec.h -- declarations for dynamically growable vectors
- Copyright (C) 1995, 2007-2010 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2007-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/fnprint.c b/libidu/fnprint.c
index 663d542..577e01f 100644
--- a/libidu/fnprint.c
+++ b/libidu/fnprint.c
@@ -1,5 +1,5 @@
/* fnprint.c -- print a list of file names
- Copyright (C) 1986, 1995-1996, 2007-2010 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1995-1996, 2007-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/idfile.c b/libidu/idfile.c
index 52b1284..dc1716a 100644
--- a/libidu/idfile.c
+++ b/libidu/idfile.c
@@ -1,5 +1,5 @@
/* idfile.c -- read & write mkid database file header
- Copyright (C) 1986, 1995-1996, 1999-2000, 2007-2010 Free Software
+ Copyright (C) 1986, 1995-1996, 1999-2000, 2007-2011 Free Software
Foundation, Inc.
Written by Greg McGary <address@hidden>
diff --git a/libidu/idfile.h b/libidu/idfile.h
index 0b9f886..875638e 100644
--- a/libidu/idfile.h
+++ b/libidu/idfile.h
@@ -1,5 +1,5 @@
/* idfile.h -- decls for ID file header and constituent file names
- Copyright (C) 1986, 1995-1996, 1999, 2007-2010 Free Software Foundation,
+ Copyright (C) 1986, 1995-1996, 1999, 2007-2011 Free Software Foundation,
Inc.
Written by Greg McGary <address@hidden>
diff --git a/libidu/idread.c b/libidu/idread.c
index 679ee25..aa6eee0 100644
--- a/libidu/idread.c
+++ b/libidu/idread.c
@@ -1,5 +1,5 @@
/* idread.c -- functions to read ID database files
- Copyright (C) 1995-1996, 1999, 2007-2010 Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 1999, 2007-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/idu-hash.c b/libidu/idu-hash.c
index ec82a2b..9c7e6bd 100644
--- a/libidu/idu-hash.c
+++ b/libidu/idu-hash.c
@@ -1,5 +1,5 @@
/* hash.c -- hash table maintenance
- Copyright (C) 1995, 1999, 2007-2010 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1999, 2007-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/idu-hash.h b/libidu/idu-hash.h
index 53af217..af4b5f9 100644
--- a/libidu/idu-hash.h
+++ b/libidu/idu-hash.h
@@ -1,5 +1,5 @@
/* idu-hash.h -- decls for hash table
- Copyright (C) 1995, 1999, 2007-2010 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1999, 2007-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/iduglobal.h b/libidu/iduglobal.h
index 703bb23..46b2fc1 100644
--- a/libidu/iduglobal.h
+++ b/libidu/iduglobal.h
@@ -2,7 +2,7 @@
#define _iduglobal_h
/* iduglobal.h -- global definitions for libidu
- Copyright (C) 1995, 1999, 2005, 2007, 2009-2010 Free Software Foundation,
+ Copyright (C) 1995, 1999, 2005, 2007, 2009-2011 Free Software Foundation,
Inc.
Written by Claudio Fontana <address@hidden>
diff --git a/libidu/idwrite.c b/libidu/idwrite.c
index 48736d9..86a4b27 100644
--- a/libidu/idwrite.c
+++ b/libidu/idwrite.c
@@ -1,5 +1,5 @@
/* idwrite.c -- functions to write ID database files
- Copyright (C) 1995-1996, 2007-2010 Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 2007-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/scanners.c b/libidu/scanners.c
index c9da949..d17ed5f 100644
--- a/libidu/scanners.c
+++ b/libidu/scanners.c
@@ -1,5 +1,5 @@
/* scanners.c -- file & directory name manipulations
- Copyright (C) 1986, 1995-1996, 1999-2000, 2007-2010 Free Software
+ Copyright (C) 1986, 1995-1996, 1999-2000, 2007-2011 Free Software
Foundation, Inc.
Written by Greg McGary <address@hidden>
diff --git a/libidu/scanners.h b/libidu/scanners.h
index 77d7835..3410656 100644
--- a/libidu/scanners.h
+++ b/libidu/scanners.h
@@ -1,5 +1,5 @@
/* scanners.h -- defs for interface to scanners.c
- Copyright (C) 1986, 1995-1996, 1999, 2007-2010 Free Software Foundation,
+ Copyright (C) 1986, 1995-1996, 1999, 2007-2011 Free Software Foundation,
Inc.
Written by Greg McGary <address@hidden>
diff --git a/libidu/tokflags.h b/libidu/tokflags.h
index 48f9d42..08cf779 100644
--- a/libidu/tokflags.h
+++ b/libidu/tokflags.h
@@ -1,5 +1,5 @@
/* tokflags.h -- decls for per-token flags
- Copyright (C) 1995-1996, 2007, 2009-2010 Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 2007, 2009-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/walker.c b/libidu/walker.c
index b268ac5..0f2870f 100644
--- a/libidu/walker.c
+++ b/libidu/walker.c
@@ -1,5 +1,5 @@
/* walker.c -- nifty file-tree walker
- Copyright (C) 1986, 1995-1996, 1999-2000, 2008-2010 Free Software
+ Copyright (C) 1986, 1995-1996, 1999-2000, 2008-2011 Free Software
Foundation, Inc.
Written by Greg McGary <address@hidden>
diff --git a/libidu/xnls.h b/libidu/xnls.h
index 09227bc..f7b1fbd 100644
--- a/libidu/xnls.h
+++ b/libidu/xnls.h
@@ -1,5 +1,5 @@
/* xnls.h -- NLS declarations
- Copyright (C) 1996, 2007, 2009-2010 Free Software Foundation, Inc.
+ Copyright (C) 1996, 2007, 2009-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/lisp/idutils.el b/lisp/idutils.el
index 220e39b..533ed6e 100644
--- a/lisp/idutils.el
+++ b/lisp/idutils.el
@@ -1,5 +1,5 @@
;;; idutils.el --- emacs interface to `lid -R grep', a.k.a. `gid'
-;;; Copyright (C) 1995-1996, 2006-2010 Free Software Foundation, Inc.
+;;; Copyright (C) 1995-1996, 2006-2011 Free Software Foundation, Inc.
;;; Greg McGary <address@hidden>.
;; This file is part of GNU idutils.
diff --git a/src/fid.c b/src/fid.c
index 4ee8726..e35a56d 100644
--- a/src/fid.c
+++ b/src/fid.c
@@ -1,5 +1,5 @@
/* fid.c -- list all tokens in the given file(s)
- Copyright (C) 1986, 1995-1996, 2008-2010 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1995-1996, 2008-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/src/fnid.c b/src/fnid.c
index a82f13b..54aa9f5 100644
--- a/src/fnid.c
+++ b/src/fnid.c
@@ -1,5 +1,5 @@
/* fnid.c -- report which files constitute an ID database
- Copyright (C) 1996, 2008-2010 Free Software Foundation, Inc.
+ Copyright (C) 1996, 2008-2011 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/src/lid.c b/src/lid.c
index 26246a9..7f6c29c 100644
--- a/src/lid.c
+++ b/src/lid.c
@@ -1,5 +1,5 @@
/* lid.c -- primary query interface for mkid database
- Copyright (C) 1986, 1995-1996, 1999-2000, 2007-2010 Free Software
+ Copyright (C) 1986, 1995-1996, 1999-2000, 2007-2011 Free Software
Foundation, Inc.
Written by Greg McGary <address@hidden>
diff --git a/src/mkid.c b/src/mkid.c
index b1a0fa9..de47a5f 100644
--- a/src/mkid.c
+++ b/src/mkid.c
@@ -1,5 +1,5 @@
/* mkid.c -- build an identifer database
- Copyright (C) 1986, 1995-1996, 1999, 2007-2010 Free Software Foundation,
+ Copyright (C) 1986, 1995-1996, 1999, 2007-2011 Free Software Foundation,
Inc.
Written by Greg McGary <address@hidden>
diff --git a/src/xtokid.c b/src/xtokid.c
index fe79a8d..255f57a 100644
--- a/src/xtokid.c
+++ b/src/xtokid.c
@@ -1,5 +1,5 @@
/* idx.c -- simple interface for testing scanners scanners
- Copyright (C) 1986, 1995-1996, 1999, 2007-2010 Free Software Foundation,
+ Copyright (C) 1986, 1995-1996, 1999, 2007-2011 Free Software Foundation,
Inc.
Written by Greg McGary <address@hidden>
diff --git a/testsuite/Coreutils.pm b/testsuite/Coreutils.pm
index b6178fc..72e457e 100644
--- a/testsuite/Coreutils.pm
+++ b/testsuite/Coreutils.pm
@@ -1,7 +1,7 @@
package Coreutils;
# This is a testing framework.
-# Copyright (C) 1998, 2000-2002, 2004-2010 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2000-2002, 2004-2011 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
diff --git a/testsuite/CuTmpdir.pm b/testsuite/CuTmpdir.pm
index 5225603..b0f7b44 100644
--- a/testsuite/CuTmpdir.pm
+++ b/testsuite/CuTmpdir.pm
@@ -1,7 +1,7 @@
package CuTmpdir;
# create, then chdir into a temporary sub-directory
-# Copyright (C) 2007-2010 Free Software Foundation, Inc.
+# Copyright (C) 2007-2011 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
diff --git a/testsuite/check.mk b/testsuite/check.mk
index 01709f8..114cf9a 100644
--- a/testsuite/check.mk
+++ b/testsuite/check.mk
@@ -1,5 +1,5 @@
# Include this file at the end of each tests/*/Makefile.am.
-# Copyright (C) 2007-2010 Free Software Foundation, Inc.
+# Copyright (C) 2007-2011 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
diff --git a/testsuite/consistency b/testsuite/consistency
index cb87f0d..f6238b3 100755
--- a/testsuite/consistency
+++ b/testsuite/consistency
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2007-2010 Free Software Foundation, Inc.
+# Copyright (C) 2007-2011 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
diff --git a/testsuite/envvar-check b/testsuite/envvar-check
index 65fda9b..4268027 100644
--- a/testsuite/envvar-check
+++ b/testsuite/envvar-check
@@ -1,7 +1,7 @@
# -*- sh -*-
# Check environment variables for sane values while testing.
-# Copyright (C) 2000-2001, 2003-2004, 2006-2010 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2004, 2006-2011 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
diff --git a/testsuite/files0-from b/testsuite/files0-from
index 01851c0..931d83e 100755
--- a/testsuite/files0-from
+++ b/testsuite/files0-from
@@ -2,7 +2,7 @@
# Exercise the --files0-from option.
# FIXME: keep this file in sync with coreutils/tests/du/files0-from.
-# Copyright (C) 2006-2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2011 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
diff --git a/testsuite/help-version b/testsuite/help-version
index 2518f6d..56130e1 100755
--- a/testsuite/help-version
+++ b/testsuite/help-version
@@ -2,7 +2,7 @@
# Make sure all these programs work properly
# when invoked with --help or --version.
-# Copyright (C) 2000-2010 Free Software Foundation, Inc.
+# Copyright (C) 2000-2011 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
diff --git a/testsuite/infloop-kawa-el b/testsuite/infloop-kawa-el
index 98d9f39..af8b0c6 100755
--- a/testsuite/infloop-kawa-el
+++ b/testsuite/infloop-kawa-el
@@ -1,7 +1,7 @@
#!/bin/sh
# This would provoke an infloop with source from 4.2+ (cvs as of 2007-01-19).
-# Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2011 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
diff --git a/testsuite/init.sh b/testsuite/init.sh
index 7943526..e348b1b 100644
--- a/testsuite/init.sh
+++ b/testsuite/init.sh
@@ -1,6 +1,6 @@
# source this file; set up for tests
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009-2011 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
--
1.7.4.1.499.g53f9
>From 6c73977d8231f1d671da166e3ad85c731971d4d6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 4 Jan 2011 10:13:15 +0100
Subject: [PATCH 3/8] maint: avoid syntax-check failure due to new
sc_bindtextdomain rule
* cfg.mk (local-checks-to-skip): Add sc_bindtextdomain.
Remove references to rules that are no longer in maint.mk.
---
cfg.mk | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 777e928..50f56b6 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -18,11 +18,10 @@
manual_title = GNU idutils: ID database utilities
# Tests not to run as part of "make distcheck".
-# Exclude changelog-check here so that there's less churn in ChangeLog
-# files -- otherwise, you'd need to have the upcoming version number
-# at the top of the file for each `make distcheck' run.
-local-checks-to-skip = changelog-check strftime-check patch-check \
- sc_prohibit_atoi_atof sc_changelog check-AUTHORS
+local-checks-to-skip = \
+ sc_bindtextdomain \
+ sc_changelog \
+ sc_prohibit_atoi_atof
old_NEWS_hash = 7c42fc431cadd9164dde6f9a7113b920
--
1.7.4.1.499.g53f9
>From ceda0a8ef2c71533fad3348cadb8d820a45cba1d Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 4 Jan 2011 10:17:01 +0100
Subject: [PATCH 4/8] maint: remove two empty #if...#endif blocks
* src/lid.c: Remove empty #if...#endif blocks.
---
src/lid.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/lid.c b/src/lid.c
index 7f6c29c..ed5d788 100644
--- a/src/lid.c
+++ b/src/lid.c
@@ -135,16 +135,10 @@ static void tree8_to_bits_1 (unsigned char **bits_vec,
static struct file_link **tree8_to_flinkv (unsigned char const *hits_tree8);
static struct file_link **bits_to_flinkv (unsigned char const *bits_vec);
-#if HAVE_TERMIOS_H || HAVE_TERMIO_H || HAVE_SGTTY_H
-#endif
-
static void savetty (void);
static void restoretty (void);
static void chartty (void);
-#if HAVE_TERMIOS_H || HAVE_TERMIO_H || HAVE_SGTTY_H
-#endif
-
#define TOLOWER(c) (isupper (c) ? tolower (c) : (c))
#define IS_ALNUM(c) (isalnum (c) || (c) == '_')
--
1.7.4.1.499.g53f9
>From 128ab801c7a8dce08201a27ab437e7a69497e678 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 4 Jan 2011 11:21:13 +0100
Subject: [PATCH 5/8] maint: avoid new false-positive syntax-check test
failures
* .x-sc_program_name: Exempt main programs in testsuite/.
* .x-sc_prohibit_always_true_header_tests: New file, to exempt
src/lid.c from test for uses of cpp conditional, HAVE_TERMIOS_H.
It looks like lid.c's uses (of struct termios) cannot be guaranteed
to work with gnulib's replacement.
---
.x-sc_program_name | 1 +
.x-sc_prohibit_always_true_header_tests | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
create mode 100644 .x-sc_program_name
create mode 100644 .x-sc_prohibit_always_true_header_tests
diff --git a/.x-sc_program_name b/.x-sc_program_name
new file mode 100644
index 0000000..3b37365
--- /dev/null
+++ b/.x-sc_program_name
@@ -0,0 +1 @@
+testsuite/
diff --git a/.x-sc_prohibit_always_true_header_tests
b/.x-sc_prohibit_always_true_header_tests
new file mode 100644
index 0000000..b476bf8
--- /dev/null
+++ b/.x-sc_prohibit_always_true_header_tests
@@ -0,0 +1,2 @@
+src/lid.c
+ChangeLog
--
1.7.4.1.499.g53f9
>From dc0d008ebc15185402cd8e1046da98dc220ee139 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 20 Mar 2011 10:52:28 +0100
Subject: [PATCH 6/8] tests: avoid new compilation failure of a gnulib test
program
* bootstrap.conf (avoided_gnulib_modules): Do not use --avoid=lock.
That would lead to compilation failure of the localenames.c test.
---
bootstrap.conf | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index a3d5637..374df66 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -19,7 +19,6 @@
# We don't need these modules, even though gnulib-tool mistakenly
# includes them because of gettext and fchdir dependencies.
avoided_gnulib_modules='
- --avoid=lock
--avoid=canonicalize-lgpl
'
--
1.7.4.1.499.g53f9
>From 6ad266585b81aa4197690e643fe246164379eb1a Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 20 Mar 2011 10:21:33 +0100
Subject: [PATCH 7/8] maint: remove unused inclusion of <stddef.h>
* libidu/scanners.c: As above.
* libidu/walker.c: Likewise.
* src/mkid.c: Likewise.
---
libidu/scanners.c | 1 -
libidu/walker.c | 1 -
src/mkid.c | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/libidu/scanners.c b/libidu/scanners.c
index d17ed5f..eb106d5 100644
--- a/libidu/scanners.c
+++ b/libidu/scanners.c
@@ -23,7 +23,6 @@
#include <fcntl.h>
#include <getopt.h>
#include <stdlib.h>
-#include <stddef.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
diff --git a/libidu/walker.c b/libidu/walker.c
index 0f2870f..cf124f2 100644
--- a/libidu/walker.c
+++ b/libidu/walker.c
@@ -20,7 +20,6 @@
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
-#include <stddef.h>
#include <unistd.h>
#include <string.h>
#include <fnmatch.h>
diff --git a/src/mkid.c b/src/mkid.c
index de47a5f..41f5d67 100644
--- a/src/mkid.c
+++ b/src/mkid.c
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <errno.h>
#include <getopt.h>
-#include <stddef.h>
#include <unistd.h>
#include <string.h>
#include <sys/stat.h>
--
1.7.4.1.499.g53f9
>From b19e2dc8e8eb258d7f58fbbe9da3060f9567ff39 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 20 Mar 2011 09:56:57 +0100
Subject: [PATCH 8/8] maint: stop using .x-sc_* files to list syntax-check
exemptions
Instead, use the new mechanism with which you merely use a
variable (derived from the rule name) defined in cfg.mk to an ERE
matching the exempted file names.
* gnulib: Update to latest, to get maint.mk that implements this.
* .x-sc_cast_of_argument_to_free: Remove file.
* .x-sc_program_name: Likewise.
* .x-sc_prohibit_always_true_header_tests: Likewise.
* .x-sc_require_config_h: Likewise.
* .x-sc_require_config_h_first: Likewise.
* Makefile.am (EXTRA_DIST): Remove them from here, too.
* cfg.mk: Define variables to exempt the same files.
---
.x-sc_cast_of_argument_to_free | 1 -
.x-sc_program_name | 1 -
.x-sc_prohibit_always_true_header_tests | 2 --
.x-sc_require_config_h | 2 --
.x-sc_require_config_h_first | 2 --
Makefile.am | 2 --
cfg.mk | 9 +++++++++
7 files changed, 9 insertions(+), 10 deletions(-)
delete mode 100644 .x-sc_cast_of_argument_to_free
delete mode 100644 .x-sc_program_name
delete mode 100644 .x-sc_prohibit_always_true_header_tests
delete mode 100644 .x-sc_require_config_h
delete mode 100644 .x-sc_require_config_h_first
diff --git a/.x-sc_cast_of_argument_to_free b/.x-sc_cast_of_argument_to_free
deleted file mode 100644
index a0381d1..0000000
--- a/.x-sc_cast_of_argument_to_free
+++ /dev/null
@@ -1 +0,0 @@
-^src/lid\.c$
diff --git a/.x-sc_program_name b/.x-sc_program_name
deleted file mode 100644
index 3b37365..0000000
--- a/.x-sc_program_name
+++ /dev/null
@@ -1 +0,0 @@
-testsuite/
diff --git a/.x-sc_prohibit_always_true_header_tests
b/.x-sc_prohibit_always_true_header_tests
deleted file mode 100644
index b476bf8..0000000
--- a/.x-sc_prohibit_always_true_header_tests
+++ /dev/null
@@ -1,2 +0,0 @@
-src/lid.c
-ChangeLog
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
deleted file mode 100644
index 6183d47..0000000
--- a/.x-sc_require_config_h
+++ /dev/null
@@ -1,2 +0,0 @@
-^testsuite/single_file_token_bug\.c$
-^src/lid-[aegl]id\.c$
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
deleted file mode 100644
index 6183d47..0000000
--- a/.x-sc_require_config_h_first
+++ /dev/null
@@ -1,2 +0,0 @@
-^testsuite/single_file_token_bug\.c$
-^src/lid-[aegl]id\.c$
diff --git a/Makefile.am b/Makefile.am
index ca4a382..9c5dba8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,6 @@ SUBDIRS = lib libidu src lisp doc man gnulib-tests testsuite po
EXTRA_DIST = \
.prev-version \
.version \
- .x-sc_cast_of_argument_to_free \
- .x-sc_require_config_h \
cfg.mk \
dist-check.mk \
idutils.spec \
diff --git a/cfg.mk b/cfg.mk
index 50f56b6..9be2819 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -35,3 +35,12 @@ update-copyright-env = \
UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
_hv_file = $(srcdir)/testsuite/help-version
+
+exclude_file_name_regexp--sc_cast_of_argument_to_free = ^src/lid\.c$$
+exclude_file_name_regexp--sc_program_name = ^testsuite/
+exclude_file_name_regexp--sc_prohibit_always_true_header_tests = src/lid\.c$$
+exclude_file_name_regexp--sc_prohibit_strcmp = ^libidu/iduglobal\.h$$
+
+config_h_exempt = ^(testsuite/single_file_token_bug\.c|src/lid-[aegl]id\.c)$$
+exclude_file_name_regexp--sc_require_config_h = $(config_h_exempt)
+exclude_file_name_regexp--sc_require_config_h_first = $(config_h_exempt)
--
1.7.4.1.499.g53f9
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug-idutils] FYI, misc build/maint/tests patches:,
Jim Meyering <=