libcompat: Add new compat.h header

ChangeLog

@@ -1,3 +1,80 @@
+2008-09-14  Guillem Jover  <guillem@debian.org>
+
+	* libcompat/compat.h: New file.
+	* dpkg-deb/build.c: Include <compat.h>.
+	* dpkg-deb/extract.c: Likewise.
+	* dpkg-deb/info.c: Likewise.
+	* dpkg-deb/main.c: Likewise.
+	* dpkg-split/info.c: Likewise.
+	* dpkg-split/join.c: Likewise.
+	* dpkg-split/main.c: Likewise.
+	* dpkg-split/queue.c: Likewise.
+	* dpkg-split/split.c: Likewise.
+	* dselect/basecmds.cc: Likewise.
+	* dselect/baselist.cc: Likewise.
+	* dselect/basetop.cc: Likewise.
+	* dselect/bindings.cc: Likewise.
+	* dselect/curkeys.cc: Likewise.
+	* dselect/helpmsgs.cc: Likewise.
+	* dselect/main.cc: Likewise.
+	* dselect/methkeys.cc: Likewise.
+	* dselect/methlist.cc: Likewise.
+	* dselect/method.cc: Likewise.
+	* dselect/methparse.cc: Likewise.
+	* dselect/pkgcmds.cc: Likewise.
+	* dselect/pkgdepcon.cc: Likewise.
+	* dselect/pkgdisplay.cc: Likewise.
+	* dselect/pkginfo.cc: Likewise.
+	* dselect/pkgkeys.cc: Likewise.
+	* dselect/pkglist.cc: Likewise.
+	* dselect/pkgsublist.cc: Likewise.
+	* dselect/pkgtop.cc: Likewise.
+	* lib/cleanup.c: Likewise.
+	* lib/compression.c: Likewise.
+	* lib/database.c: Likewise.
+	* lib/dbmodify.c: Likewise.
+	* lib/dump.c: Likewise.
+	* lib/ehandle.c: Likewise.
+	* lib/lock.c: Likewise.
+	* lib/log.c: Likewise.
+	* lib/md5.c: Likewise.
+	* lib/mlib.c: Likewise.
+	* lib/myopt-util.c: Likewise.
+	* lib/myopt.c: Likewise.
+	* lib/nfmalloc.c: Likewise.
+	* lib/parse.c: Likewise.
+	* lib/parsehelp.c: Likewise.
+	* lib/path.c: Likewise.
+	* lib/showpkg.c: Likewise.
+	* lib/string.c: Likewise.
+	* lib/subproc.c: Likewise.
+	* lib/triglib.c: Likewise.
+	* lib/utils.c: Likewise.
+	* lib/varbuf.c: Likewise.
+	* lib/vercmp.c: Likewise.
+	* src/archives.c: Likewise.
+	* src/cleanup.c: Likewise.
+	* src/configure.c: Likewise.
+	* src/depcon.c: Likewise.
+	* src/enquiry.c: Likewise.
+	* src/errors.c: Likewise.
+	* src/filesdb.c: Likewise.
+	* src/help.c: Likewise.
+	* src/main.c: Likewise.
+	* src/packages.c: Likewise.
+	* src/pkg-list.c: Likewise.
+	* src/pkg-show.c: Likewise.
+	* src/processarc.c: Likewise.
+	* src/query.c: Likewise.
+	* src/remove.c: Likewise.
+	* src/select.c: Likewise.
+	* src/trigcmd.c: Likewise.
+	* src/trigproc.c: Likewise.
+	* src/update.c: Likewise.
+	* lib/fields.c: Likewise. Do not include "strnlen.h", now implicitly
+	included by <compat.h>.
+	* lib/tarfn.c: Likewise.
+
 2008-09-14  Guillem Jover  <guillem@debian.org>
 
 	* lib/dpkg.h: Move <locale.h> inclusion and standard_startup locale

dpkg-deb/build.c

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dpkg-deb/extract.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dpkg-deb/info.c

@@ -20,6 +20,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dpkg-deb/main.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dpkg-split/info.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dpkg-split/join.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dpkg-split/main.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dpkg-split/queue.c

@@ -28,6 +28,7 @@
  * all numbers in hex
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dpkg-split/split.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/basecmds.cc

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/baselist.cc

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/basetop.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <stdio.h>
 #include <string.h>

dselect/bindings.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/curkeys.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg.h>
 #include <dpkg-db.h>

dselect/helpmsgs.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/main.cc

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/methkeys.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <stdio.h>
 #include <string.h>

dselect/methlist.cc

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/method.cc

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/methparse.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/pkgcmds.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <stdio.h>
 #include <string.h>

dselect/pkgdepcon.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <stdio.h>
 #include <string.h>

dselect/pkgdisplay.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/pkginfo.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/pkgkeys.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <stdio.h>
 #include <string.h>

dselect/pkglist.cc

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/pkgsublist.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

dselect/pkgtop.cc

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/cleanup.c

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg.h>
 #include <stdio.h>

lib/compression.c

@@ -1,4 +1,5 @@
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/database.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/dbmodify.c

@@ -20,6 +20,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/dump.c

@@ -22,6 +22,7 @@
 
 /* FIXME: don't write uninteresting packages */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/ehandle.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/fields.c

@@ -20,13 +20,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include "strnlen.h"
 
 #include <dpkg.h>
 #include <dpkg-db.h>

lib/lock.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/log.c

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/md5.c

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <string.h>		/* for memcpy() */
 #include <sys/types.h>		/* for stupid systems */

lib/mlib.c

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/myopt-util.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/myopt.c

@@ -20,6 +20,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/nfmalloc.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/parse.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/parsehelp.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/path.c

@@ -21,6 +21,8 @@
  */
 
 #include <config.h>
+#include <compat.h>
+
 #include <string.h>
 #include <dpkg-priv.h>
 

lib/showpkg.c

@@ -18,6 +18,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/string.c

@@ -21,6 +21,8 @@
  */
 
 #include <config.h>
+#include <compat.h>
+
 #include <dpkg-priv.h>
 
 char *

lib/subproc.c

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/tarfn.c

@@ -5,6 +5,7 @@
  * This is free software under the GNU General Public License.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -17,8 +18,6 @@
 #include <dpkg.h>
 #include <dpkg-priv.h>
 
-#include "strnlen.h"
-
 struct TarHeader {
 	char Name[100];
 	char Mode[8];

lib/triglib.c

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

lib/utils.c

@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 #include <dpkg.h>

lib/varbuf.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <stdlib.h>
 #include <string.h>

lib/vercmp.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <ctype.h>
 #include <string.h>

libcompat/compat.h

@@ -0,0 +1,36 @@
+/*
+ * libcompat - system compatibility library
+ * compat.h - system compatibility declarations
+ *
+ * Copyright © 2008 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef COMPAT_H
+#define COMPAT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <strnlen.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* COMPAT_H */
+

src/archives.c

@@ -20,6 +20,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/cleanup.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/configure.c

@@ -20,6 +20,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/depcon.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/enquiry.c

@@ -21,6 +21,7 @@
 
 /* FIXME: per-package audit */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/errors.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/filesdb.c

@@ -20,6 +20,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/help.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/main.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/packages.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/pkg-list.c

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <string.h>
 

src/pkg-show.c

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/processarc.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/query.c

@@ -20,6 +20,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/remove.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/select.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/trigcmd.c

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/trigproc.c

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>
 

src/update.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <config.h>
+#include <compat.h>
 
 #include <dpkg-i18n.h>