support multiple oauth users; mhlogin now requires -user

[nmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index a21a7180ec7947bfaaafb524c4bff76c1052a149..33ac013ddda74854271a7c25c22d3d33eb5e73e9 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -18,9 +18,9 @@ char *etcpath(char *);
 struct msgs_array;
 
 void add_profile_entry (const char *, const char *);
 struct msgs_array;
 
 void add_profile_entry (const char *, const char *);

-void adios (char *, char *, ...) NORETURN;
+void adios (char *, const char *, ...) NORETURN;

 void admonish (char *, char *, ...);
 void admonish (char *, char *, ...);

-void advertise (char *, char *, char *, va_list);
+void advertise (char *, char *, const char *, va_list);

 void advise (char *, char *, ...);
 char **argsplit (char *, char **, int *);
 void argsplit_msgarg (struct msgs_array *, char *, char **);
 void advise (char *, char *, ...);
 char **argsplit (char *, char **, int *);
 void argsplit_msgarg (struct msgs_array *, char *, char **);


@@ -57,6 +57,7 @@ char **copyip (char **, char **, int);
 void cpydata (int, int, char *, char *);
 void cpydgst (int, int, char *, char *);
 char *cpytrim (const char *);
 void cpydata (int, int, char *, char *);
 void cpydgst (int, int, char *, char *);
 char *cpytrim (const char *);

+char *rtrim (char *);

 int decode_rfc2047 (char *, char *, size_t);
 void discard (FILE *);
 char *upcase (const char *);
 int decode_rfc2047 (char *, char *, size_t);
 void discard (FILE *);
 char *upcase (const char *);


@@ -214,7 +215,6 @@ int m_atoi (char *);
 char *m_backup (char *);
 int m_convert (struct msgs *, char *);
 char *m_draft (char *, char *, int, int *);
 char *m_backup (char *);
 int m_convert (struct msgs *, char *);
 char *m_draft (char *, char *, int, int *);

-void m_eomsbr (m_getfld_state_t, int (*)(int));

 void m_getfld_state_reset (m_getfld_state_t *);
 void m_getfld_state_destroy (m_getfld_state_t *);
 void m_getfld_track_filepos (m_getfld_state_t *, FILE *);
 void m_getfld_state_reset (m_getfld_state_t *);
 void m_getfld_state_destroy (m_getfld_state_t *);
 void m_getfld_track_filepos (m_getfld_state_t *, FILE *);


@@ -287,13 +287,12 @@ void print_version (char *);
 void push (void);
 char *pwd (void);
 char *r1bindex(char *, int);
 void push (void);
 char *pwd (void);
 char *r1bindex(char *, int);

-void readconfig (struct node **, FILE *, char *, int);
+void readconfig (struct node **, FILE *, const char *, int);

 int refile (char **, char *);
 void ruserpass (char *, char **, char **);
 int remdir (char *);
 void scan_detect_mbox_style (FILE *);
 void scan_finished ();
 int refile (char **, char *);
 void ruserpass (char *, char **, char **);
 int remdir (char *);
 void scan_detect_mbox_style (FILE *);
 void scan_finished ();

-void scan_eom_action (int (*)());

 void scan_reset_m_getfld_state ();
 int seq_addmsg (struct msgs *, char *, int, int, int);
 int seq_addsel (struct msgs *, char *, int, int);
 void scan_reset_m_getfld_state ();
 int seq_addmsg (struct msgs *, char *, int, int, int);
 int seq_addsel (struct msgs *, char *, int, int);


@@ -385,7 +384,7 @@ int unputenv (char *);
  *
  */
 void unquote_string(const char *input, char *output);
  *
  */
 void unquote_string(const char *input, char *output);

-int uprf (char *, char *);
+int uprf (const char *, const char *);

 int vfgets (FILE *, char **);
 
 /*
 int vfgets (FILE *, char **);
 
 /*