Module Name: src
Committed By: joerg
Date: Thu Nov 3 14:13:54 UTC 2011
Modified Files:
src/tools/compat: compat_defs.h configure configure.ac
nbtool_config.h.in
Log Message:
Add getline(3) compat glue.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.72 -r1.73 src/tools/compat/configure
cvs rdiff -u -r1.73 -r1.74 src/tools/compat/configure.ac
cvs rdiff -u -r1.26 -r1.27 src/tools/compat/nbtool_config.h.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/compat/compat_defs.h
diff -u src/tools/compat/compat_defs.h:1.81 src/tools/compat/compat_defs.h:1.82
--- src/tools/compat/compat_defs.h:1.81 Mon Sep 5 07:38:52 2011
+++ src/tools/compat/compat_defs.h Thu Nov 3 14:13:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_defs.h,v 1.81 2011/09/05 07:38:52 jdc Exp $ */
+/* $NetBSD: compat_defs.h,v 1.82 2011/11/03 14:13:53 joerg Exp $ */
#ifndef __NETBSD_COMPAT_DEFS_H__
#define __NETBSD_COMPAT_DEFS_H__
@@ -276,6 +276,11 @@ int flock(int, int);
char *fparseln(FILE *, size_t *, size_t *, const char [3], int);
#endif
+#if !HAVE_GETLINE
+ssize_t getdelim(char **, size_t *, int, FILE *);
+ssize_t getline(char **, size_t *, FILE *);
+#endif
+
#if !HAVE_ISSETUGID
int issetugid(void);
#endif
Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.72 src/tools/compat/configure:1.73
--- src/tools/compat/configure:1.72 Sun Aug 14 20:25:01 2011
+++ src/tools/compat/configure Thu Nov 3 14:13:53 2011
@@ -4981,8 +4981,8 @@ EOF
fi
for ac_func in atoll asprintf asnprintf basename devname dirfd dirname \
- esetfunc fgetln flock fpurge __fpurge futimes getopt getopt_long \
- group_from_gid gid_from_group \
+ esetfunc fgetln flock fpurge __fpurge futimes getline \
+ getopt getopt_long group_from_gid gid_from_group \
heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \
mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \
pwrite raise_default_signal random setenv \
Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.73 src/tools/compat/configure.ac:1.74
--- src/tools/compat/configure.ac:1.73 Sun Aug 14 20:22:42 2011
+++ src/tools/compat/configure.ac Thu Nov 3 14:13:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.73 2011/08/14 20:22:42 apb Exp $
+# $NetBSD: configure.ac,v 1.74 2011/11/03 14:13:53 joerg Exp $
#
# Autoconf definition file for libnbcompat.
#
@@ -146,8 +146,8 @@ AC_CHECK_DECLS(sys_signame,,, [#include
# Library functions (where a .h check isn't enough).
AC_FUNC_ALLOCA
AC_CHECK_FUNCS(atoll asprintf asnprintf basename devname dirfd dirname \
- esetfunc fgetln flock fpurge __fpurge futimes getopt getopt_long \
- group_from_gid gid_from_group \
+ esetfunc fgetln flock fpurge __fpurge futimes getline \
+ getopt getopt_long group_from_gid gid_from_group \
heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \
mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \
pwrite raise_default_signal random setenv \
Index: src/tools/compat/nbtool_config.h.in
diff -u src/tools/compat/nbtool_config.h.in:1.26 src/tools/compat/nbtool_config.h.in:1.27
--- src/tools/compat/nbtool_config.h.in:1.26 Sun Aug 14 20:25:01 2011
+++ src/tools/compat/nbtool_config.h.in Thu Nov 3 14:13:53 2011
@@ -1,6 +1,6 @@
/* nbtool_config.h.in. Generated automatically from configure.ac by autoheader. */
-/* $NetBSD: nbtool_config.h.in,v 1.26 2011/08/14 20:25:01 apb Exp $ */
+/* $NetBSD: nbtool_config.h.in,v 1.27 2011/11/03 14:13:53 joerg Exp $ */
#ifndef __NETBSD_NBTOOL_CONFIG_H__
#define __NETBSD_NBTOOL_CONFIG_H__
@@ -267,6 +267,9 @@
/* Define if you have the `futimes' function. */
#undef HAVE_FUTIMES
+/* Define if you have the `getline' function. */
+#undef HAVE_GETLINE
+
/* Define if you have the `getopt' function. */
#undef HAVE_GETOPT
