Fix file descriptor leak in ruserpass()

[nmh] / h / nmh.h

diff --git a/h/nmh.h b/h/nmh.h
index ca32f58b738b762d5d704f611e407a825d8b94a7..e3dd3c6c1a186f45c959ecc2bd3da3bc2fd3ba2e 100644 (file)
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -1,10 +1,8 @@
-
-/*
- * nmh.h -- system configuration header file
+/* nmh.h -- system configuration header file
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <unistd.h>
@@ -12,14 +10,22 @@
 #include <ctype.h>
 #ifndef NDEBUG
   /* See etc/gen-ctype-checked.c. */
-# include <sbr/ctype-checked.h>
+#include "sbr/ctype-checked.h"
 #endif
 #include <assert.h>
+
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# define bool int
+# define true 1
+# define false 0
+#endif
+
 #include <sys/stat.h>
 #include <sys/wait.h>
 
 # include <dirent.h>
-#define NLENGTH(dirent) strlen((dirent)->d_name)
 
 #include <stdlib.h>
 #include <stdarg.h>
@@ -68,11 +74,6 @@
 # endif
 #endif
 
-/*
- * Defaults for programs if they aren't configured in a user's profile
- */
-
-#define DEFAULT_PAGER "more"
-#define DEFAULT_EDITOR "vi"
-
-#include <signal.h>
+#ifndef HAVE_GETLINE
+ssize_t getline(char **lineptr, size_t *n, FILE *stream);
+#endif