Made the RPATHS config option the default and removed the #ifdefs.

[mmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index 6200ea6..4a74bec 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -38,13 +38,14 @@ 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 *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 *);
@@ -59,7 +60,8 @@ int getanswer(char *);
 char **getarguments(char *, int, char **, int);
 char *get_charset();
 char *getcpy(char *);
-char *getfolder(int);
+char *getcurfol(void);
+char *getdeffol(void);
 int lkclose(int, char*);
 int lkfclose(FILE *, char *);
 FILE *lkfopen(char *, char *);
@@ -70,8 +72,6 @@ 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_maildir(char *);
-char *m_mailpath(char *);
 char *m_name(int);
 int m_putenv(char *, char *);
 char *m_mktemp(const char *, int *, FILE **);
@@ -80,18 +80,16 @@ void m_unknown(FILE *);
 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);
+char *mhbasename(char *);
 void readconfig(struct node **, FILE *, char *, int);
 int refile(char **, char *);
 void ruserpass(char *, char **, char **);
@@ -113,17 +111,14 @@ void seq_setunseen(struct msgs *, int);
 int showfile(char **, char *);
 int smatch(char *, struct swit *);
 char *snprintb(char *, size_t, unsigned, char *);
-int isprefix(char *, 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);
-
-#ifdef RPATHS
 int get_returnpath(char *, int, char *, int);
-#endif
 
 /*
 ** prototypes for compatibility functions in library
@@ -138,22 +133,19 @@ 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);
 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 *);
+               char *, char *);
+
+/*
+** from the former mts.h
+*/
+char *LocalName(void);  /* hostname */
+char *SystemName(void);
+char *getusername(void);
+char *getfullname(void);