Completely reworked the path convertion functions

[mmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index 15031ea..b7d6bfb 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -45,6 +45,8 @@ 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 +61,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 +73,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 **);
@@ -81,11 +82,9 @@ int makedir(char *);
 char *nmh_getpass(const char *);
 char *norm_charmap(char *);
 char *new_fs(char *, char *, char *);
-char *path(char *, int);
 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 *);
@@ -115,6 +114,7 @@ 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 *);