Clean up

Author: sebastinas

configure.ac

@@ -91,11 +91,11 @@ AC_CHECK_HEADERS(unistd.h \
                  netinet/in_systm.h \
                  arpa/inet.h \
                  sys/ioctl.h \
-                 memory.h \
                  setjmp.h \
                  errno.h \
                  strcasecmp.h \
-                 fcntl.h
+                 fcntl.h \
+                 grp.h
 )
 
 
@@ -136,7 +136,7 @@ if test "$ac_cv_func_fnmatch_gnu" = "yes"; then
             [Define if you have a fnmatch supporting GNU extensions])
 fi
 
-AC_CHECK_FUNCS(strcoll memcpy sigsetjmp)
+AC_CHECK_FUNCS(sigsetjmp)
 AC_CHECK_FUNCS(vasprintf, [], [AC_LIBOBJ([vasprintf])])
 AC_CHECK_DECLS([asprintf, vasprintf])
 

lib/security.c

@@ -151,7 +151,7 @@ static int sec_get_data(int fd, struct buffer *buf, int level)
 
 static size_t buffer_read(struct buffer *buf, void *data, size_t len)
 {
-	len = min(len, buf->size - buf->index);
+	len = MIN(len, buf->size - buf->index);
 	memcpy(data, (char *)buf->data + buf->index, len);
 	buf->index += len;
 	return len;

src/syshdr.h

@@ -47,24 +47,19 @@
 #include <string.h>
 #include <stdlib.h>
 
-
 #include <ctype.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <setjmp.h>
 
 #include <errno.h>
-#include <grp.h>
 
 #include "libmhe/xmalloc.h"
 
 #include <sys/ioctl.h>
 
-#if defined HAVE_DECL_ASPRINTF && !HAVE_DECL_ASPRINTF
-int asprintf(char **strp, const char *format, ...) YAFC_PRINTF(2, 3);
-#endif
-#if defined HAVE_DECL_VASPRINTF && !HAVE_DECL_VASPRINTF
-int vasprintf(char **strp, const char *format, va_list ap);
+#ifdef HAVE_GRP_H
+# include <grp.h>
 #endif
 
 #ifdef HAVE_UNISTD_H
@@ -181,7 +176,12 @@ typedef CPPFunction rl_completion_func_t;
 # include "../lib/getopt.h"  /* our own, in lib/ */
 #endif
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
+#if defined HAVE_DECL_ASPRINTF && !HAVE_DECL_ASPRINTF
+int asprintf(char **strp, const char *format, ...) YAFC_PRINTF(2, 3);
+#endif
+#if defined HAVE_DECL_VASPRINTF && !HAVE_DECL_VASPRINTF
+int vasprintf(char **strp, const char *format, va_list ap);
+#endif
 
 #ifdef HAVE_KERBEROS
 # define SECFTP