Merge branch 'pick' into master

[mmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index 32ec0b5..fad1af4 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -55,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*);
@@ -108,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);
@@ -163,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 *);