Merge branch 'pick' into master

[mmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index 8455b38..fad1af4 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -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 *);
@@ -107,6 +107,7 @@ char *snprintb(char *, size_t, unsigned, char *);
 int stringdex(char *, char *);
 char *toabsdir(char *);
 char *trim(unsigned char *);
+char *rtrim(char *);
 char *trimcpy(unsigned char *);
 int unputenv(char *);
 void unquote_string(const char *input, char *output);
@@ -162,4 +163,4 @@ int is_readonly(struct msgs *);
 void set_readonly(struct msgs *);
 int other_files(struct msgs *);
 void set_other_files(struct msgs *);
-
+char *getthreadid(const char *);