X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fprototypes.h;h=baf40d94a8d298c584b170593a35449bc9ad7acb;hp=7e8948ed748f23d2b7a0409be7d6a57e59786bfa;hb=ced6090a330d3d83d0bce709f756aa3d7d65fea4;hpb=0569d6d1631dc90d4f2f2df6bdd0599c7ecc7814

diff --git a/h/prototypes.h b/h/prototypes.h
index 7e8948e..baf40d9 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -1,13 +1,10 @@
-
 /*
- * prototypes.h -- various prototypes
- *
- * $Id$
- */
+** prototypes.h -- various prototypes
+*/
 
 /*
- * missing system prototypes
- */
+** missing system prototypes
+*/
 #ifndef HAVE_TERMCAP_H
 extern int tgetent (char *bp, char *name);
 extern int tgetnum (char *id);
@@ -18,14 +15,14 @@ extern int tputs (char *cp, int affcnt, int (*outc) (int));
 #endif
 
 /*
- * prototype from config.h
- */
+** prototype from config.h
+*/
 char *etcpath(char *);
 
 /*
- * prototypes from the nmh subroutine library
- */
-void adios (char *, char *, ...);
+** prototypes from the nmh subroutine library
+*/
+void adios (char *, char *, ...) NORETURN;
 void admonish (char *, char *, ...);
 void advertise (char *, char *, char *, va_list);
 void advise (char *, char *, ...);
@@ -47,7 +44,7 @@ void cpydata (int, int, char *, char *);
 void cpydgst (int, int, char *, char *);
 int decode_rfc2047 (char *, char *, size_t);
 void discard (FILE *);
-int done (int);
+int default_done (int);
 int ext_hook(char *, char *, char *);
 int fdcompare (int, int);
 int folder_addmsg (struct msgs **, char *, int, int, int, int, char *);
@@ -70,16 +67,15 @@ int lkopen(char *, int, mode_t);
 int m_atoi (char *);
 char *m_backup (char *);
 int m_convert (struct msgs *, char *);
-char *m_draft (char *, char *, int, int *);
-void m_eomsbr (int (*)());
+char *m_draft (char *);
 int m_getfld (int, unsigned char *, unsigned char *, int, FILE *);
 int m_gmprot (void);
 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,15 +87,14 @@ 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);
 char *r1bindex(char *, int);
 void readconfig (struct node **, FILE *, char *, int);
 int refile (char **, char *);
-int ruserpass(char *, char **, char **);
-int remdir (char *);
+void ruserpass(char *, char **, char **);
 int seq_addmsg (struct msgs *, char *, int, int, int);
 int seq_addsel (struct msgs *, char *, int, int);
 char *seq_bits (struct msgs *);
@@ -107,7 +102,7 @@ int seq_delmsg (struct msgs *, char *, int);
 int seq_delsel (struct msgs *, char *, int, int);
 int seq_getnum (struct msgs *, char *);
 char *seq_list (struct msgs *, char *);
-int seq_nameok (char *);
+int seq_nameok (unsigned char *);
 void seq_print (struct msgs *, char *);
 void seq_printall (struct msgs *);
 void seq_read (struct msgs *);
@@ -120,7 +115,7 @@ int smatch(char *, struct swit *);
 char *snprintb (char *, size_t, unsigned, char *);
 int ssequal (char *, char *);
 int stringdex (char *, char *);
-char *trimcpy (char *);
+char *trimcpy (unsigned char *);
 int unputenv (char *);
 int uprf (char *, char *);
 int vfgets (FILE *, char **);
@@ -131,8 +126,8 @@ int get_returnpath (char *, int, char *, int);
 #endif
 
 /*
- * prototypes for compatibility functions in library
- */
+** 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);
@@ -143,23 +138,22 @@ int strncasecmp (const char *s1, const char *s2, size_t n);
 
 
 /*
- * some prototypes for address parsing system
- * (others are in addrsbr.h)
- */
+** some prototypes for address parsing system
+** (others are in addrsbr.h)
+*/
 char *LocalName(void);
 char *SystemName(void);
 char *OfficialName(char *);
 
 /*
- * prototypes for some routines in uip
- */
+** prototypes for some routines in uip
+*/
 int annotate (char *, char *, char *, int, int, int, int);
 void annolist(char *, char *, char *, int);
 void annopreserve(int);
 int distout (char *, char *, char *);
 void replout (FILE *, char *, char *, struct msgs *, int,
-	int, char *, char *, char *);
+		int, char *, char *, char *);
 int sendsbr (char **, int, char *, struct stat *, int, char *, int);
 int what_now (char *, int, int, char *, char *,
-	int, struct msgs *, char *, int, char *);
-
+		int, struct msgs *, char *, int, char *);