X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fprototypes.h;h=69556f94d64bc5ba94808c339c13a7feaa065eeb;hp=e6e7dc14b1e71d57113876e2ae5b4281a00f4b75;hb=ee8d01d64e8832304256de53db07228e2be67f6a;hpb=0595979e1f0514b3da28762f336b3b9ac9eec5c5

diff --git a/h/prototypes.h b/h/prototypes.h
index e6e7dc1..69556f9 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -39,6 +39,7 @@ void cpydata(int, int, char *, char *);
 void cpydgst(int, int, char *, char *);
 int decode_rfc2047(char *, char *, size_t);
 int default_done(int);
+int encode_rfc2047(const char *name, char **value, const char *charset);
 int execprog(char *, char **);
 int execprogl(char *, char *, ...);
 char *expandfol(char *);
@@ -54,7 +55,6 @@ char **getans(char *, struct swit *);
 int getanswer(char *);
 char **getarguments(char *, int, char **, int);
 char *get_charset();
-char *getcpy(char *);
 char *getcurfol(void);
 char *getdeffol(void);
 int lkclose(int, char*);
@@ -65,7 +65,7 @@ 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 *);
+enum state m_getfld2(enum state, struct field *, FILE *);
 int m_gmprot(void);
 char *m_name(int);
 int m_putenv(char *, char *);
@@ -73,6 +73,7 @@ char *m_mktemp(const char *, int *, FILE **);
 char *m_mktemp2(const char *, const char *, int *, FILE **);
 void thisisanmbox(FILE *);
 int makedir(char *);
+int mh_strcasecmp(const char *s1, const char *s2);
 char *norm_charmap(char *);
 char *new_fs(char *, char *);
 int pidwait(pid_t, int);
@@ -108,28 +109,12 @@ char *toabsdir(char *);
 char *trim(unsigned char *);
 char *trimcpy(unsigned char *);
 int unputenv(char *);
+void unquote_string(const char *input, char *output);
 int uprf(char *, char *);
 int vfgets(FILE *, char **);
 char *write_charset_8bit(void);
 
-/*
- * Remove quotes and quoted-pair sequences from RFC-5322 atoms.
- *
- * Currently the actual algorithm is simpler than it technically should
- * be: any quotes are simply eaten, unless they're preceded by the escape
- * character (\).  This seems to be sufficient for our needs for now.
- *
- * Arguments:
- *
- * input	- The input string
- * output	- The output string; is assumed to have at least as much
- *		  room as the input string.  At worst the output string will
- *		  be the same size as the input string; it might be smaller.
- *
- */
-void unquote_string(const char *input, char *output);
 
-int mh_strcasecmp(const char *s1, const char *s2);
 
 
 /*
@@ -178,19 +163,3 @@ void set_readonly(struct msgs *);
 int other_files(struct msgs *);
 void set_other_files(struct msgs *);
 
-/*
- * Encode a message header using RFC 2047 encoding.  If the message contains
- * no non-ASCII characters, then leave the header as-is.
- *
- * Arguments include:
- *
- * name     - Message header name
- * value    - Message header content; must point to allocated memory
- *        (may be changed if encoding is necessary)
- * charset  - Charset used for encoding.  If NULL, obtain from system
- *        locale.
- *
- * Returns 0 on success, any other value on failure.
- */
-
-int encode_rfc2047(const char *name, char **value, const char *charset);