Changed type of name argument to m_getfld() from unsigned char *

[mmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index a91418e..c40e563 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -1,20 +1,18 @@
 
 /*
  * prototypes.h -- various prototypes
- *
- * $Id$
  */
 
 /*
  * missing system prototypes
  */
-#ifndef HAVE_TERMCAP_H
-extern int tgetent (char *bp, char *name);
-extern int tgetnum (char *id);
-extern int tgetflag (char *id);
-extern char *tgetstr (char *id, char **area);
-extern char *tgoto (char *cm, int destcol, int destline);
-extern int tputs (char *cp, int affcnt, int (*outc) (int));
+#if ! defined(HAVE_TERMCAP_H) && ! defined (HAVE_NCURSES_TERMCAP_H)
+  extern int tgetent (char *bp, char *name);
+  extern int tgetnum (char *id);
+  extern int tgetflag (char *id);
+  extern char *tgetstr (char *id, char **area);
+  extern char *tgoto (char *cm, int destcol, int destline);
+  extern int tputs (char *cp, int affcnt, int (*outc) (int));
 #endif
 
 /*
@@ -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 *);
@@ -47,7 +46,9 @@ 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);
+void escape_display_name (char *, size_t);
+void escape_local_part (char *, size_t);
 int ext_hook(char *, char *, char *);
 int fdcompare (int, int);
 int folder_addmsg (struct msgs **, char *, int, int, int, int, char *);
@@ -58,9 +59,12 @@ struct msgs *folder_read (char *);
 struct msgs *folder_realloc (struct msgs *, int, int);
 int gans (char *, struct swit *);
 char **getans (char *, struct swit *);
+#ifdef READLINE_SUPPORT
+char **getans_via_readline (char *, struct swit *);
+#endif /* READLINE_SUPPORT */
 int getanswer (char *);
 char **getarguments (char *, int, char **, int);
-char *get_charset();
+char *get_charset(void);
 char *getcpy (char *);
 char *getfolder(int);
 int lkclose(int, char*);
@@ -71,17 +75,19 @@ 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 (*)());
-int m_getfld (int, unsigned char *, unsigned char *, int, FILE *);
+void m_eomsbr (int (*)(int));
+int m_getfld (int, unsigned char[NAMESZ], 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 *);
+int m_rand (unsigned char *, size_t);
+char *m_mktemp(const char *, int *, FILE **);
+char *m_mktemp2(const char *, const char *, int *, FILE **);
 void m_unknown(FILE *);
 int makedir (char *);
+char *message_id (time_t, int);
 char *nmh_getpass(const char *);
 char *norm_charmap(char *);
 char *new_fs (char *, char *, char *);
@@ -91,14 +97,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 **);
+void ruserpass(char *, char **, char **);
 int remdir (char *);
 int seq_addmsg (struct msgs *, char *, int, int, int);
 int seq_addsel (struct msgs *, char *, int, int);
@@ -126,18 +132,6 @@ int uprf (char *, char *);
 int vfgets (FILE *, char **);
 char *write_charset_8bit (void);
 
-#ifdef RPATHS
-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);
 
@@ -146,9 +140,8 @@ int strncasecmp (const char *s1, const char *s2, size_t n);
  * some prototypes for address parsing system
  * (others are in addrsbr.h)
  */
-char *LocalName(void);
+char *LocalName(int);
 char *SystemName(void);
-char *OfficialName(char *);
 
 /*
  * prototypes for some routines in uip
@@ -156,10 +149,23 @@ char *OfficialName(char *);
 int annotate (char *, char *, char *, int, int, int, int);
 void annolist(char *, char *, char *, int);
 void annopreserve(int);
+void clear_screen(void);
+void m_pclose(void);
+int make_intermediates(char *);
+int mhl(int, char **);
+int mhlsbr(int, char **, FILE *(*)(char *));
 int distout (char *, char *, char *);
 void replout (FILE *, char *, char *, struct msgs *, int,
-       int, char *, char *, char *);
+       int, char *, char *, char *, int);
+int sc_hardcopy(void);
+int sc_length(void);
+int sc_width(void);
+int build_form (char *, char *, int *, char *, char *, char *, char *,
+               char *, char *);
 int sendsbr (char **, int, char *, struct stat *, int, char *, int);
+int SOprintf (char *, ...);
 int what_now (char *, int, int, char *, char *,
-       int, struct msgs *, char *, int, char *);
-
+       int, struct msgs *, char *, int, char *, int);
+int WhatNow(int, char **);
+int writeBase64aux(FILE *, FILE *);
+int writeBase64 (unsigned char *, size_t, unsigned char *);