X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=h%2Fprototypes.h;h=1c55136d983f328ff2a97847cc7281b70486773b;hb=c70ca7816838825c93fbc54ac9e4a6e2a7bef6d8;hp=52fab3aa7fe4e8dcf05fc2f2507bb78b88dc6cfc;hpb=871bd3b965321122be0db49961369b111e4ea4db;p=mmh diff --git a/h/prototypes.h b/h/prototypes.h index 52fab3a..1c55136 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -1,8 +1,6 @@ /* * prototypes.h -- various prototypes - * - * $Id$ */ /* @@ -25,7 +23,7 @@ char *etcpath(char *); /* * prototypes from the nmh subroutine library */ -void adios (char *, char *, ...); +void adios (char *, char *, ...) NORETURN; void admonish (char *, char *, ...); void advertise (char *, char *, char *, va_list); void advise (char *, char *, ...); @@ -33,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 *); @@ -78,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 *); @@ -91,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); @@ -130,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);