X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fprototypes.h;h=4a74bec53e7ce7293c62d6b36e880d88f6f6ae96;hp=5ddd467fc911a94d32e13aaf0711ae900cc6a89e;hb=e954d689b5adafa4ec74e7dbd1e087dbf998f6d6;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/h/prototypes.h b/h/prototypes.h
index 5ddd467..4a74bec 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -1,163 +1,151 @@
 /*
- * prototypes.h -- various prototypes
- */
+** 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);
-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));
+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
 
 /*
- * prototype from config.h
- */
+** prototype from config.h
+*/
 char *etcpath(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 *, ...);
-void ambigsw (char *, struct swit *);
+** 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 *, ...);
+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);
+char **brkstring(char *, char *, char *);
+int check_charset(char *, int);
 void closefds(int);
-char *concat (char *, ...);
-int context_del (char *);
-char *context_find (char *);
-int context_foil (char *);
-void context_read (void);
-void context_replace (char *, char *);
-void context_save (void);
-char *copy (char *, char *);
-char **copyip (char **, char **, int);
-void cpydata (int, int, char *, char *);
-void cpydgst (int, int, char *, char *);
-int decode_rfc2047 (char *, char *, size_t);
-void discard (FILE *);
-int default_done (int);
+char *concat(char *, ...);
+int context_del(char *);
+char *context_find(char *);
+int context_foil(char *);
+void context_read(void);
+void context_replace(char *, char *);
+void context_save(void);
+char **copyip(char **, char **, int);
+void cpydata(int, int, char *, char *);
+void cpydgst(int, int, char *, char *);
+int decode_rfc2047(char *, char *, size_t);
+void discard(FILE *);
+int default_done(int);
+char *expandfol(char *);
+char *expanddir(char *);
 int ext_hook(char *, char *, char *);
-int fdcompare (int, int);
-int folder_addmsg (struct msgs **, char *, int, int, int, int, char *);
-int folder_delmsgs (struct msgs *, int, int);
-void folder_free (struct msgs *);
-int folder_pack (struct msgs **, int);
-struct msgs *folder_read (char *);
-struct msgs *folder_realloc (struct msgs *, int, int);
-int gans (char *, struct swit *);
-char **getans (char *, struct swit *);
-int getanswer (char *);
-char **getarguments (char *, int, char **, int);
+int fdcompare(int, int);
+int folder_addmsg(struct msgs **, char *, int, int, int, int, char *);
+int folder_delmsgs(struct msgs *, int, int);
+void folder_free(struct msgs *);
+int folder_pack(struct msgs **, int);
+struct msgs *folder_read(char *);
+struct msgs *folder_realloc(struct msgs *, int, int);
+int gans(char *, struct swit *);
+char **getans(char *, struct swit *);
+int getanswer(char *);
+char **getarguments(char *, int, char **, int);
 char *get_charset();
-char *getcpy (char *);
-char *getfolder(int);
+char *getcpy(char *);
+char *getcurfol(void);
+char *getdeffol(void);
 int lkclose(int, char*);
 int lkfclose(FILE *, char *);
 FILE *lkfopen(char *, char *);
 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 *);
-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 *);
+int m_atoi(char *);
+char *m_backup(char *);
+int m_convert(struct msgs *, char *);
+char *m_draft(char *);
+int m_getfld(int, unsigned char *, unsigned char *, int, FILE *);
+int m_gmprot(void);
+char *m_name(int);
+int m_putenv(char *, char *);
 char *m_mktemp(const char *, int *, FILE **);
 char *m_mktemp2(const char *, const char *, int *, FILE **);
 void m_unknown(FILE *);
-int makedir (char *);
+int makedir(char *);
 char *nmh_getpass(const char *);
 char *norm_charmap(char *);
-char *new_fs (char *, char *, char *);
-char *path(char *, int);
+char *new_fs(char *, char *);
 int peekc(FILE *ib);
-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 *, 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 pidwait(pid_t, int);
+int pidstatus(int, FILE *, char *);
+void print_help(char *, struct swit *, int);
+void print_sw(char *, struct swit *, char *, FILE *);
+void print_version(char *);
+void push(void);
+char *pwd(void);
+char *mhbasename(char *);
+void readconfig(struct node **, FILE *, char *, int);
+int refile(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);
-char *seq_bits (struct msgs *);
-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 (unsigned char *);
-void seq_print (struct msgs *, char *);
-void seq_printall (struct msgs *);
-void seq_read (struct msgs *);
-void seq_save (struct msgs *);
-void seq_setcur (struct msgs *, int);
-void seq_setprev (struct msgs *);
-void seq_setunseen (struct msgs *, int);
-int showfile (char **, char *);
+int seq_addmsg(struct msgs *, char *, int, int, int);
+int seq_addsel(struct msgs *, char *, int, int);
+char *seq_bits(struct msgs *);
+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(unsigned char *);
+void seq_print(struct msgs *, char *);
+void seq_printall(struct msgs *);
+void seq_read(struct msgs *);
+void seq_save(struct msgs *);
+void seq_setcur(struct msgs *, int);
+void seq_setprev(struct msgs *);
+void seq_setunseen(struct msgs *, int);
+int showfile(char **, char *);
 int smatch(char *, struct swit *);
-char *snprintb (char *, size_t, unsigned, char *);
-int ssequal (char *, char *);
-int stringdex (char *, char *);
-char *trimcpy (unsigned char *);
-int unputenv (char *);
-int uprf (char *, char *);
-int vfgets (FILE *, char **);
-char *write_charset_8bit (void);
-
-#ifdef RPATHS
-int get_returnpath (char *, int, char *, int);
-#endif
+char *snprintb(char *, size_t, unsigned, char *);
+int stringdex(char *, char *);
+char *toabsdir(char *);
+char *trimcpy(unsigned char *);
+int unputenv(char *);
+int uprf(char *, char *);
+int vfgets(FILE *, char **);
+char *write_charset_8bit(void);
+int get_returnpath(char *, int, char *, int);
 
 /*
- * 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);
+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);
+int mh_strcasecmp(const char *s1, const char *s2);
+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 *SystemName(void);
-char *OfficialName(char *);
-
-/*
- * prototypes for some routines in uip
- */
-int annotate (char *, char *, char *, int, int, int, int);
+** 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 sendsbr (char **, int, char *, struct stat *, int, char *, int);
-int what_now (char *, int, int, char *, char *,
-	int, struct msgs *, char *, int, char *);
+int distout(char *, char *, char *);
+int what_now(char *, int, int, char *, char *, int, struct msgs *,
+		char *, char *);
+
+/*
+** from the former mts.h
+*/
+char *LocalName(void);  /* hostname */
+char *SystemName(void);
+char *getusername(void);
+char *getfullname(void);