diff options
-rw-r--r-- | auth/gsasl.c | 2 | ||||
-rw-r--r-- | auth/lbuf.c | 4 | ||||
-rw-r--r-- | auth/lbuf.h | 5 | ||||
-rw-r--r-- | auth/mysql.c | 5 | ||||
-rw-r--r-- | auth/pam.c | 6 | ||||
-rw-r--r-- | auth/pgsql.c | 11 | ||||
-rw-r--r-- | auth/sql.c | 9 | ||||
-rw-r--r-- | auth/tls.c | 2 | ||||
-rw-r--r-- | auth/virtual.c | 7 | ||||
-rw-r--r-- | examples/iconv.c | 2 | ||||
-rw-r--r-- | imap4d/auth_gsasl.c | 9 | ||||
-rw-r--r-- | imap4d/imap4d.c | 3 | ||||
-rw-r--r-- | imap4d/util.c | 4 | ||||
-rw-r--r-- | include/mailutils/mu_auth.h | 6 | ||||
-rw-r--r-- | include/mailutils/mutil.h | 4 | ||||
-rw-r--r-- | include/mailutils/stream.h | 6 | ||||
-rw-r--r-- | libmu_scm/mu_mailbox.c | 3 | ||||
-rw-r--r-- | mailbox/file_stream.c | 2 | ||||
-rw-r--r-- | mailbox/filter_iconv.c | 6 | ||||
-rw-r--r-- | mailbox/include/stream0.h | 2 | ||||
-rw-r--r-- | mailbox/maildir/maildir.h | 3 | ||||
-rw-r--r-- | mailbox/maildir/mbox.c | 3 | ||||
-rw-r--r-- | mailbox/mapfile_stream.c | 2 | ||||
-rw-r--r-- | mailbox/mu_auth.c | 4 | ||||
-rw-r--r-- | mailbox/mutil.c | 5 | ||||
-rw-r--r-- | mailbox/stream.c | 6 | ||||
-rw-r--r-- | mailbox/system.c | 16 | ||||
-rw-r--r-- | mh/mh_format.c | 9 | ||||
-rw-r--r-- | mh/mh_init.c | 19 | ||||
-rw-r--r-- | mh/send.c | 8 | ||||
-rw-r--r-- | pop3d/extra.c | 6 |
31 files changed, 95 insertions, 84 deletions
diff --git a/auth/gsasl.c b/auth/gsasl.c index 418c9ab92..e2de6a2ed 100644 --- a/auth/gsasl.c +++ b/auth/gsasl.c @@ -253,7 +253,7 @@ _gsasl_open (stream_t stream) } int -_gsasl_strerror (stream_t stream, char **pstr) +_gsasl_strerror (stream_t stream, const char **pstr) { struct _gsasl_stream *s = stream_get_owner (stream); *pstr = gsasl_strerror (s->last_err); diff --git a/auth/lbuf.c b/auth/lbuf.c index d93a3d9ca..b405e900b 100644 --- a/auth/lbuf.c +++ b/auth/lbuf.c @@ -85,7 +85,7 @@ _auth_lb_grow (struct _line_buffer *s, const char *ptr, size_t size) } int -_auth_lb_read (struct _line_buffer *s, const char *optr, size_t osize) +_auth_lb_read (struct _line_buffer *s, char *optr, size_t osize) { int len; @@ -103,7 +103,7 @@ _auth_lb_read (struct _line_buffer *s, const char *optr, size_t osize) } int -_auth_lb_readline (struct _line_buffer *s, const char *ptr, size_t size) +_auth_lb_readline (struct _line_buffer *s, char *ptr, size_t size) { char *p = strchr (s->buffer, '\n'); diff --git a/auth/lbuf.h b/auth/lbuf.h index 534ff226f..558e15b05 100644 --- a/auth/lbuf.h +++ b/auth/lbuf.h @@ -24,9 +24,8 @@ void _auth_lb_destroy __P((struct _line_buffer **s)); void _auth_lb_drop __P((struct _line_buffer *s)); int _auth_lb_grow __P((struct _line_buffer *s, const char *ptr, size_t size)); -int _auth_lb_read __P((struct _line_buffer *s, const char *ptr, size_t size)); -int _auth_lb_readline __P((struct _line_buffer *s, const char *ptr, - size_t size)); +int _auth_lb_read __P((struct _line_buffer *s, char *ptr, size_t size)); +int _auth_lb_readline __P((struct _line_buffer *s, char *ptr, size_t size)); int _auth_lb_writelines __P((struct _line_buffer *s, const char *iptr, size_t isize, off_t offset, int (*wr) __PMT ((void *data, char *start, diff --git a/auth/mysql.c b/auth/mysql.c index e35f9dbb1..a6cd50541 100644 --- a/auth/mysql.c +++ b/auth/mysql.c @@ -29,7 +29,8 @@ int -mysql_auth_sql_by_name (struct mu_auth_data **return_data, void *key, +mysql_auth_sql_by_name (struct mu_auth_data **return_data, + const void *key, void *func_data ARG_UNUSED, void *call_data ARG_UNUSED) { @@ -224,7 +225,7 @@ mysql_auth_sql_by_uid (struct mu_auth_data **return_data, void *key, int mysql_sql_authenticate (struct mu_auth_data **return_data ARG_UNUSED, - void *key, + const void *key, void *func_data ARG_UNUSED, void *call_data) { struct mu_auth_data *auth_data = key; diff --git a/auth/pam.c b/auth/pam.c index b0150f95d..217d9537c 100644 --- a/auth/pam.c +++ b/auth/pam.c @@ -102,11 +102,11 @@ static struct pam_conv PAM_conversation = { &mu_pam_conv, NULL }; int mu_authenticate_pam (struct mu_auth_data **return_data ARG_UNUSED, - void *key, + const void *key, void *func_data ARG_UNUSED, void *call_data) { - struct mu_auth_data *auth_data = key; + const struct mu_auth_data *auth_data = key; char *pass = call_data; pam_handle_t *pamh; int pamerror; @@ -164,7 +164,7 @@ struct argp mu_pam_argp = { int mu_authenticate_pam (struct mu_auth_data **return_data ARG_UNUSED, - void *key ARG_UNUSED, + const void *key ARG_UNUSED, void *func_data ARG_UNUSED, void *call_data ARG_UNUSED) { diff --git a/auth/pgsql.c b/auth/pgsql.c index 744df5fd6..1c40759a8 100644 --- a/auth/pgsql.c +++ b/auth/pgsql.c @@ -136,7 +136,8 @@ pg_auth_common (PGresult *res, char *query_str, struct mu_auth_data **auth) } int -pg_auth_sql_by_name (struct mu_auth_data **return_data, void *key, +pg_auth_sql_by_name (struct mu_auth_data **return_data, + const void *key, void *func_data ARG_UNUSED, void *call_data ARG_UNUSED) { @@ -185,7 +186,8 @@ pg_auth_sql_by_name (struct mu_auth_data **return_data, void *key, } int -pg_auth_sql_by_uid (struct mu_auth_data **return_data, void *key, +pg_auth_sql_by_uid (struct mu_auth_data **return_data, + const void *key, void *func_data ARG_UNUSED, void *call_data ARG_UNUSED) { @@ -235,13 +237,14 @@ pg_auth_sql_by_uid (struct mu_auth_data **return_data, void *key, } int -pg_sql_authenticate (struct mu_auth_data **return_data ARG_UNUSED, void *key, +pg_sql_authenticate (struct mu_auth_data **return_data ARG_UNUSED, + const void *key, void *func_data ARG_UNUSED, void *call_data) { PGconn *conn; PGresult *res = NULL; - struct mu_auth_data *auth_data = key; + const struct mu_auth_data *auth_data = key; char *pass = call_data; char *query_str = NULL; int rc = 1; diff --git a/auth/sql.c b/auth/sql.c index ef08bfeca..de6f07c14 100644 --- a/auth/sql.c +++ b/auth/sql.c @@ -214,11 +214,14 @@ struct argp mu_sql_argp = { # ifdef HAVE_MYSQL -int mysql_auth_sql_by_name __P((struct mu_auth_data **return_data, void *key, +int mysql_auth_sql_by_name __P((struct mu_auth_data **return_data, + const void *key, void *func_data, void *call_data)); -int mysql_auth_sql_by_uid __P((struct mu_auth_data **return_data, void *key, +int mysql_auth_sql_by_uid __P((struct mu_auth_data **return_data, + const void *key, void *func_data, void *call_data)); -int mysql_sql_authenticate __P((struct mu_auth_data **return_data, void *key, +int mysql_sql_authenticate __P((struct mu_auth_data **return_data, + const void *key, void *func_data, void *call_data)); # define mu_sql_authenticate mysql_sql_authenticate diff --git a/auth/tls.c b/auth/tls.c index 91a1d7106..905d299ad 100644 --- a/auth/tls.c +++ b/auth/tls.c @@ -534,7 +534,7 @@ _tls_open_client (stream_t stream) } int -_tls_strerror (stream_t stream, char **pstr) +_tls_strerror (stream_t stream, const char **pstr) { struct _tls_stream *s = stream_get_owner (stream); *pstr = gnutls_strerror (s->last_err); diff --git a/auth/virtual.c b/auth/virtual.c index 07977929b..7902777fd 100644 --- a/auth/virtual.c +++ b/auth/virtual.c @@ -57,7 +57,7 @@ static char *site_virtual_pwddir = SITE_VIRTUAL_PWDDIR; static struct passwd * -getpwnam_virtual (char *u) +getpwnam_virtual (const char *u) { struct passwd *pw = NULL; FILE *pfile; @@ -133,7 +133,8 @@ getpwnam_ip_virtual (const char *u) /* Virtual domains */ static int -mu_auth_virt_domain_by_name (struct mu_auth_data **return_data, void *key, +mu_auth_virt_domain_by_name (struct mu_auth_data **return_data, + const void *key, void *unused_func_data, void *unused_call_data) { int rc; @@ -202,7 +203,7 @@ struct argp mu_virt_argp = { #else static int mu_auth_virt_domain_by_name (struct mu_auth_data **return_data ARG_UNUSED, - void *key ARG_UNUSED, + const void *key ARG_UNUSED, void *func_data ARG_UNUSED, void *call_data ARG_UNUSED) { diff --git a/examples/iconv.c b/examples/iconv.c index c96a5ab86..906942a45 100644 --- a/examples/iconv.c +++ b/examples/iconv.c @@ -58,7 +58,7 @@ main (int argc, char **argv) stream_flush (out); if (rc) { - char *p; + const char *p; stream_strerror (cvt, &p); fprintf (stderr, "error: %s / %s\n", mu_strerror (rc), p); } diff --git a/imap4d/auth_gsasl.c b/imap4d/auth_gsasl.c index f9b645974..61fe116ab 100644 --- a/imap4d/auth_gsasl.c +++ b/imap4d/auth_gsasl.c @@ -39,7 +39,7 @@ create_gsasl_stream (stream_t *newstr, stream_t transport, int flags) if ((rc = stream_open (*newstr)) != 0) { - char *p; + const char *p; if (stream_strerror (*newstr, &p)) p = mu_strerror (rc); syslog (LOG_ERR, _("cannot open SASL input stream: %s"), p); @@ -148,7 +148,6 @@ auth_gsasl_capa_init (int disable) { int rc; char *listmech, *name, *s; - size_t size; rc = gsasl_server_mechlist (ctx, &listmech); if (rc != GSASL_OK) @@ -283,9 +282,3 @@ auth_gsasl_init () auth_gsasl_capa_init (0); } -wd() -{ - int _st=0; - while (_st==0) - _st=_st; -} diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c index 6d8c74176..eefae4eaa 100644 --- a/imap4d/imap4d.c +++ b/imap4d/imap4d.c @@ -16,6 +16,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "imap4d.h" +#ifdef WITH_GSASL +# include <mailutils/gsasl.h> +#endif mailbox_t mbox; char *homedir; diff --git a/imap4d/util.c b/imap4d/util.c index 1d47c621f..a9da386d8 100644 --- a/imap4d/util.c +++ b/imap4d/util.c @@ -471,7 +471,7 @@ imap4d_readline (void) } else if (rc) { - char *p; + const char *p; if (stream_strerror (istream, &p)) p = strerror (errno); @@ -1141,7 +1141,7 @@ imap4d_init_tls_server () if (stream_open (stream)) { - char *p; + const char *p; stream_strerror (stream, &p); syslog (LOG_ERR, _("cannot open TLS stream: %s"), p); return 0; diff --git a/include/mailutils/mu_auth.h b/include/mailutils/mu_auth.h index 76163f159..7fa073109 100644 --- a/include/mailutils/mu_auth.h +++ b/include/mailutils/mu_auth.h @@ -35,7 +35,7 @@ struct mu_auth_data { }; typedef int (*mu_auth_fp) __P((struct mu_auth_data **data, - void *key, + const void *key, void *func_data, void *call_data)); @@ -52,7 +52,7 @@ struct mu_auth_module { extern int mu_auth_runlist __P((list_t flist, struct mu_auth_data **return_data, - void *key, void *data)); + const void *key, void *data)); extern struct mu_auth_data * mu_get_auth_by_name __P ((const char *username)); @@ -63,7 +63,7 @@ extern int mu_authenticate __P((struct mu_auth_data *auth_data, char *pass)); extern int mu_auth_nosupport __P((struct mu_auth_data **return_data, - void *key, + const void *key, void *func_data, void *call_data)); diff --git a/include/mailutils/mutil.h b/include/mailutils/mutil.h index b7c073d94..7280e5193 100644 --- a/include/mailutils/mutil.h +++ b/include/mailutils/mutil.h @@ -132,8 +132,8 @@ extern int mu_scheme_autodetect_p __P((const char *scheme, const char **path)); extern int mu_fd_wait __P((int fd, int *pflags, struct timeval *tvp)); extern int mu_decode_filter __P((stream_t *pfilter, stream_t input, - char *filter_type, - char *fromcode, char *tocode)); + const char *filter_type, + const char *fromcode, const char *tocode)); extern enum mu_iconv_fallback_mode mu_default_fallback_mode; extern int mu_set_default_fallback __P((const char *str)); diff --git a/include/mailutils/stream.h b/include/mailutils/stream.h index a0da1c953..dc919753b 100644 --- a/include/mailutils/stream.h +++ b/include/mailutils/stream.h @@ -144,7 +144,7 @@ extern int stream_set_flush __P ((stream_t, int (*_flush) __PMT ((stream_t)), void *owner)); extern int stream_set_strerror __P ((stream_t stream, - int (*fp) (stream_t, char **), void *owner)); + int (*fp) (stream_t, const char **), void *owner)); extern int stream_set_wait __P ((stream_t stream, int (*wait) (stream_t, int *, struct timeval *), void *owner)); @@ -156,10 +156,10 @@ extern int stream_sequential_readline __P((stream_t stream, char *buf, size_t size, size_t *nbytes)); extern int stream_sequential_write __P((stream_t stream, - char *buf, size_t size)); + const char *buf, size_t size)); extern int stream_seek __P((stream_t stream, off_t off, int whence)); -extern int stream_strerror __P((stream_t stream, char **p)); +extern int stream_strerror __P((stream_t stream, const char **p)); #ifdef __cplusplus } diff --git a/libmu_scm/mu_mailbox.c b/libmu_scm/mu_mailbox.c index 0c97fd5d2..4006a52aa 100644 --- a/libmu_scm/mu_mailbox.c +++ b/libmu_scm/mu_mailbox.c @@ -51,7 +51,6 @@ mu_scm_mailbox_print (SCM mailbox_smob, SCM port, scm_print_state * pstate) struct mu_mailbox *mum = (struct mu_mailbox *) SCM_CDR (mailbox_smob); size_t count = 0; url_t url = NULL; - char *p; mailbox_messages_count (mum->mbox, &count); mailbox_get_url (mum->mbox, &url); @@ -65,7 +64,7 @@ mu_scm_mailbox_print (SCM mailbox_smob, SCM port, scm_print_state * pstate) } else { - p = url_to_string (url); + const char *p = url_to_string (url); if (p) { char buf[64]; diff --git a/mailbox/file_stream.c b/mailbox/file_stream.c index 1698ff8be..f82577cb9 100644 --- a/mailbox/file_stream.c +++ b/mailbox/file_stream.c @@ -498,7 +498,7 @@ _file_open (stream_t stream) } int -_file_strerror (stream_t unused, char **pstr) +_file_strerror (stream_t unused, const char **pstr) { *pstr = strerror (errno); return 0; diff --git a/mailbox/filter_iconv.c b/mailbox/filter_iconv.c index c174271d3..1378f7f41 100644 --- a/mailbox/filter_iconv.c +++ b/mailbox/filter_iconv.c @@ -352,7 +352,7 @@ _icvt_read (stream_t stream, char *optr, size_t osize, } int -_icvt_strerror (stream_t stream, char **pstr) +_icvt_strerror (stream_t stream, const char **pstr) { struct icvt_stream *s = stream_get_owner (stream); switch (s->state) @@ -369,7 +369,7 @@ _icvt_strerror (stream_t stream, char **pstr) case EILSEQ: snprintf (s->errbuf, sizeof s->errbuf, _("Illegal multibyte sequence near %*.*s"), - s->bufpos, s->bufpos, s->buf); + (int) s->bufpos, (int) s->bufpos, s->buf); break; default: @@ -384,7 +384,7 @@ _icvt_strerror (stream_t stream, char **pstr) break; default: - *pstr = (char*) mu_strerror (s->ec); + *pstr = mu_strerror (s->ec); } return 0; diff --git a/mailbox/include/stream0.h b/mailbox/include/stream0.h index e94b7511c..ad4e490b0 100644 --- a/mailbox/include/stream0.h +++ b/mailbox/include/stream0.h @@ -62,7 +62,7 @@ struct _stream int (*_size) __P ((stream_t, off_t *)); int (*_flush) __P ((stream_t)); int (*_setbufsiz)__P ((stream_t, size_t)); - int (*_strerror) __P ((stream_t, char **)); + int (*_strerror) __P ((stream_t, const char **)); int (*_wait) __P((stream_t, int *pflags, struct timeval *tvp)); }; diff --git a/mailbox/maildir/maildir.h b/mailbox/maildir/maildir.h index 3cdde23e9..d38397ee4 100644 --- a/mailbox/maildir/maildir.h +++ b/mailbox/maildir/maildir.h @@ -20,4 +20,5 @@ #define CURSUF "cur" #define NEWSUF "new" -extern char *maildir_mkfilename __P((char *dir, char *suffix, char *name)); +extern char *maildir_mkfilename __P((const char *dir, const char *suffix, + const char *name)); diff --git a/mailbox/maildir/mbox.c b/mailbox/maildir/mbox.c index dbaf264e2..af6b60765 100644 --- a/mailbox/maildir/mbox.c +++ b/mailbox/maildir/mbox.c @@ -62,6 +62,7 @@ #include <mailutils/url.h> #include <mailutils/observer.h> #include <mailutils/errno.h> +#include <mailutils/locker.h> #include <mailbox0.h> #include <registrar0.h> #include <amd.h> @@ -236,7 +237,7 @@ read_random (void *buf, size_t size) } char * -maildir_mkfilename (char *directory, char *suffix, char *name) +maildir_mkfilename (const char *directory, const char *suffix, const char *name) { size_t size = strlen (directory) + 1 + strlen (suffix) + 1; char *tmp; diff --git a/mailbox/mapfile_stream.c b/mailbox/mapfile_stream.c index 48a92ea31..bea04bff2 100644 --- a/mailbox/mapfile_stream.c +++ b/mailbox/mapfile_stream.c @@ -244,7 +244,7 @@ _mapfile_get_transport2 (stream_t stream, mu_transport_t *pin, mu_transport_t *p *pout = NULL; if (pin) - *pin = mfs->fd; + *pin = (mu_transport_t) mfs->fd; return 0; } diff --git a/mailbox/mu_auth.c b/mailbox/mu_auth.c index 9d2bea024..a817247e0 100644 --- a/mailbox/mu_auth.c +++ b/mailbox/mu_auth.c @@ -124,7 +124,7 @@ mu_insert_stack_entry (list_t *pflist, struct auth_stack_entry *entry) int mu_auth_runlist (list_t flist, struct mu_auth_data **return_data, - void *key, void *data) + const void *key, void *data) { int rc = 1; iterator_t itr; @@ -149,7 +149,7 @@ mu_auth_runlist (list_t flist, struct mu_auth_data **return_data, int mu_auth_nosupport (struct mu_auth_data **return_data ARG_UNUSED, - void *key ARG_UNUSED, + const void *key ARG_UNUSED, void *func_data ARG_UNUSED, void *call_data ARG_UNUSED) { diff --git a/mailbox/mutil.c b/mailbox/mutil.c index 5536b8d86..1199ff49d 100644 --- a/mailbox/mutil.c +++ b/mailbox/mutil.c @@ -1235,8 +1235,9 @@ mu_set_default_fallback (const char *str) } int -mu_decode_filter (stream_t *pfilter, stream_t input, char *filter_type, - char *fromcode, char *tocode) +mu_decode_filter (stream_t *pfilter, stream_t input, + const char *filter_type, + const char *fromcode, const char *tocode) { stream_t filter; diff --git a/mailbox/stream.c b/mailbox/stream.c index 5bb490358..3454a3dfc 100644 --- a/mailbox/stream.c +++ b/mailbox/stream.c @@ -663,7 +663,7 @@ stream_set_flags (stream_t stream, int fl) int stream_set_strerror (stream_t stream, - int (*fp) (stream_t, char **), void *owner) + int (*fp) (stream_t, const char **), void *owner) { if (stream == NULL) return EINVAL; @@ -716,7 +716,7 @@ stream_sequential_readline (stream_t stream, char *buf, size_t size, } int -stream_sequential_write (stream_t stream, char *buf, size_t size) +stream_sequential_write (stream_t stream, const char *buf, size_t size) { if (stream == NULL) return EINVAL; @@ -780,7 +780,7 @@ stream_wait (stream_t stream, int *pflags, struct timeval *tvp) } int -stream_strerror (stream_t stream, char **p) +stream_strerror (stream_t stream, const char **p) { if (stream == NULL) return EINVAL; diff --git a/mailbox/system.c b/mailbox/system.c index d6f05eb0c..6d514aa4f 100644 --- a/mailbox/system.c +++ b/mailbox/system.c @@ -44,7 +44,7 @@ /* System database */ static int -mu_auth_system (struct mu_auth_data **return_data, struct passwd *pw) +mu_auth_system (struct mu_auth_data **return_data, const struct passwd *pw) { char *mailbox_name; int rc; @@ -74,7 +74,8 @@ mu_auth_system (struct mu_auth_data **return_data, struct passwd *pw) } int -mu_auth_system_by_name (struct mu_auth_data **return_data, void *key, +mu_auth_system_by_name (struct mu_auth_data **return_data, + const void *key, void *func_data ARG_UNUSED, void *call_data ARG_UNUSED) { @@ -87,7 +88,8 @@ mu_auth_system_by_name (struct mu_auth_data **return_data, void *key, } static int -mu_auth_system_by_uid (struct mu_auth_data **return_data, void *key, +mu_auth_system_by_uid (struct mu_auth_data **return_data, + const void *key, void *func_data ARG_UNUSED, void *call_data ARG_UNUSED) { @@ -101,11 +103,11 @@ mu_auth_system_by_uid (struct mu_auth_data **return_data, void *key, static int mu_authenticate_generic (struct mu_auth_data **return_data ARG_UNUSED, - void *key, + const void *key, void *func_data ARG_UNUSED, void *call_data) { - struct mu_auth_data *auth_data = key; + const struct mu_auth_data *auth_data = key; char *pass = call_data; return !auth_data @@ -116,11 +118,11 @@ mu_authenticate_generic (struct mu_auth_data **return_data ARG_UNUSED, /* Called only if generic fails */ static int mu_authenticate_system (struct mu_auth_data **return_data ARG_UNUSED, - void *key, + const void *key, void *func_data ARG_UNUSED, void *call_data) { - struct mu_auth_data *auth_data = key; + const struct mu_auth_data *auth_data = key; char *pass = call_data; #ifdef HAVE_SHADOW_H diff --git a/mh/mh_format.c b/mh/mh_format.c index 36afd2035..e6bab5497 100644 --- a/mh/mh_format.c +++ b/mh/mh_format.c @@ -1787,14 +1787,15 @@ builtin_putaddr (struct mh_machine *mach) static void builtin_unre (struct mh_machine *mach) { - char *p; + const char *p; int rc = munre_subject (strobj_ptr (&mach->arg_str), &p); if (rc == 0 && p != strobj_ptr (&mach->arg_str)) { - p = strdup (p); + char *q = strdup (p); /* Create a copy, since strobj_create will + destroy p */ strobj_free (&mach->arg_str); - strobj_create (&mach->arg_str, p); - free (p); + strobj_create (&mach->arg_str, q); + free (q); } } diff --git a/mh/mh_init.c b/mh/mh_init.c index 8c130d441..2107f0c8b 100644 --- a/mh/mh_init.c +++ b/mh/mh_init.c @@ -407,34 +407,35 @@ mh_expand_name (const char *base, const char *name, int is_folder) { char *tmp = NULL; char *p = NULL; + char *namep; tmp = mu_tilde_expansion (name, "/", NULL); if (tmp[0] == '+') - name = tmp + 1; + namep = tmp + 1; else if (strncmp (tmp, "../", 3) == 0 || strncmp (tmp, "./", 2) == 0) { char *cwd = mu_getcwd (); - asprintf (&name, "%s/%s", cwd, tmp); + asprintf (&namep, "%s/%s", cwd, tmp); free (cwd); free (tmp); tmp = NULL; } else - name = tmp; + namep = tmp; if (!base) base = mu_path_folder_dir; if (is_folder) { - if (name[0] == '/') - asprintf (&p, "mh:%s", name); + if (namep[0] == '/') + asprintf (&p, "mh:%s", namep); else - asprintf (&p, "mh:%s/%s", base, name); + asprintf (&p, "mh:%s/%s", base, namep); } - else if (name[0] != '/') - asprintf (&p, "%s/%s", base, name); + else if (namep[0] != '/') + asprintf (&p, "%s/%s", base, namep); else - return name; + return namep; free (tmp); return p; @@ -500,7 +500,8 @@ static int send (int argc, char **argv) { int i, rc; - + char *p; + /* Verify all arguments */ for (i = 0; i < argc; i++) if (check_file (argv[i])) @@ -518,8 +519,9 @@ send (int argc, char **argv) /* Prepend url specifier to the folder dir. We won't need this when the default format becomes configurable */ - asprintf (&mu_path_folder_dir, "mh:%s", mu_path_folder_dir); - + asprintf (&p, "mh:%s", mu_path_folder_dir); + mu_path_folder_dir = p; + /* Finally, do the work */ rc = list_do (mesg_list, _action_send, NULL); return rc; diff --git a/pop3d/extra.c b/pop3d/extra.c index 1915110b8..19fbced4e 100644 --- a/pop3d/extra.c +++ b/pop3d/extra.c @@ -161,7 +161,7 @@ pop3d_init_tls_server () if (stream_open (stream)) { - char *p; + const char *p; stream_strerror (stream, &p); syslog (LOG_ERR, _("cannot open TLS stream: %s"), p); return 0; @@ -220,7 +220,7 @@ pop3d_outf (const char *fmt, ...) free (buf); if (rc) { - char *p; + const char *p; if (stream_strerror (ostream, &p)) p = strerror (errno); @@ -243,7 +243,7 @@ pop3d_readline (char *buffer, size_t size) if (rc) { - char *p; + const char *p; if (stream_strerror (ostream, &p)) p = strerror (errno); |