Clean up process wait to use POSIX waitpid() interface.

[mmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index d559baa..1c55136 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -1,19 +1,8 @@
 
 /*
  * prototypes.h -- various prototypes
- *
- * $Id$
  */
 
-/* If we're using gcc then give it some information about
- * functions that abort.
- */
-#if __GNUC__ > 2
-#define NORETURN __attribute__((__noreturn__)
-#else
-#define NORETURN
-#endif
-
 /*
  * missing system prototypes
  */
@@ -42,6 +31,7 @@ void ambigsw (char *, struct swit *);
 int atooi(char *);
 char **brkstring (char *, char *, char *);
 int check_charset (char *, int);
+int client(char *, char *, char *, int, int);
 void closefds(int);
 char *concat (char *, ...);
 int context_del (char *);
@@ -87,8 +77,8 @@ char *m_maildir (char *);
 char *m_mailpath (char *);
 char *m_name (int);
 int m_putenv (char *, char *);
-char *m_scratch (char *, char *);
-char *m_tmpfil (char *);
+char *m_mktemp(const char *, int *, FILE **);
+char *m_mktemp2(const char *, const char *, int *, FILE **);
 void m_unknown(FILE *);
 int makedir (char *);
 char *nmh_getpass(const char *);
@@ -100,7 +90,7 @@ int pidwait (pid_t, int);
 int pidstatus (int, FILE *, char *);
 char *pluspath(char *);
 void print_help (char *, struct swit *, int);
-void print_sw (char *, struct swit *, char *);
+void print_sw (char *, struct swit *, char *, FILE *);
 void print_version (char *);
 void push (void);
 char *pwd (void);
@@ -139,14 +129,6 @@ char *write_charset_8bit (void);
 int get_returnpath (char *, int, char *, int);
 #endif
 
-/*
- * prototypes for compatibility functions in library
- */
-#ifndef HAVE_SNPRINTF_PROTOTYPE
-int snprintf (char *, size_t, const char *, ...);
-int vsnprintf (char *, size_t, const char *, va_list);
-#endif
-
 int mh_strcasecmp (const char *s1, const char *s2);
 int strncasecmp (const char *s1, const char *s2, size_t n);