[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Mailutils branch, master, updated. release-2.2-672-g25df227
|
From: |
Sergey Poznyakoff |
|
Subject: |
[SCM] GNU Mailutils branch, master, updated. release-2.2-672-g25df227 |
|
Date: |
Wed, 26 Feb 2014 17:04:41 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".
http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=25df2275c794c9f223715473494ab3b10a420d40
The branch, master has been updated
via 25df2275c794c9f223715473494ab3b10a420d40 (commit)
via 144bf5da108539d9893a90d1024539500d85a390 (commit)
from 9555444d92c7b9c5e523b848beedd3fa787b184d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 25df2275c794c9f223715473494ab3b10a420d40
Author: Sergey Poznyakoff <address@hidden>
Date: Wed Feb 26 19:03:10 2014 +0200
Clean up unused variables.
commit 144bf5da108539d9893a90d1024539500d85a390
Author: Sergey Poznyakoff <address@hidden>
Date: Wed Feb 26 17:59:11 2014 +0200
Use AM_CPPFLAGS instead of INCLUDES; upgrade gint
-----------------------------------------------------------------------
Summary of changes:
comsat/Makefile.am | 5 +++--
configure.ac | 2 ++
dotlock/Makefile.am | 2 +-
examples/Makefile.am | 4 ++--
examples/base64.c | 6 ++----
examples/cpp/Makefile.am | 2 +-
examples/http.c | 4 ++--
frm/Makefile.am | 2 +-
gint | 2 +-
imap4d/Makefile.am | 2 +-
lib/Makefile.am | 2 +-
lib/mailcap.c | 7 ++-----
libmailutils/address/Makefile.am | 2 +-
libmailutils/auth/Makefile.am | 2 +-
libmailutils/base/Makefile.am | 4 ++--
libmailutils/base/amd.c | 2 +-
libmailutils/base/wicket.c | 18 ++++++++++--------
libmailutils/cfg/Makefile.am | 4 ++--
libmailutils/cfg/lexer.l | 3 +++
libmailutils/cidr/Makefile.am | 2 +-
libmailutils/datetime/Makefile.am | 2 +-
libmailutils/diag/Makefile.am | 2 +-
libmailutils/filter/Makefile.am | 2 +-
libmailutils/imapio/Makefile.am | 3 ++-
libmailutils/imapio/qstring.c | 2 ++
libmailutils/list/Makefile.am | 2 +-
libmailutils/list/locate.c | 6 +++---
libmailutils/list/replace.c | 6 +++---
libmailutils/mailbox/Makefile.am | 2 +-
libmailutils/mailer/Makefile.am | 2 +-
libmailutils/mime/Makefile.am | 2 +-
libmailutils/msgset/Makefile.am | 2 +-
libmailutils/property/Makefile.am | 2 +-
libmailutils/server/Makefile.am | 2 +-
libmailutils/sockaddr/Makefile.am | 2 +-
libmailutils/stdstream/Makefile.am | 2 +-
libmailutils/stream/Makefile.am | 2 +-
libmailutils/string/Makefile.am | 2 +-
libmailutils/tests/fltst.c | 6 ++----
libmailutils/tests/listop.c | 2 ++
libmailutils/url/Makefile.am | 2 +-
libmu_argp/Makefile.am | 2 +-
libmu_argp/muinit.c | 2 +-
libmu_auth/Makefile.am | 7 ++++---
libmu_cfg/Makefile.am | 7 ++++---
libmu_compat/Makefile.am | 2 +-
libmu_compat/tests/Makefile.am | 2 +-
libmu_cpp/Makefile.am | 2 +-
libmu_dbm/Makefile.am | 2 +-
libmu_scm/Makefile.am | 3 ++-
libmu_sieve/Makefile.am | 6 +++---
libmu_sieve/extensions/Makefile.am | 2 +-
libmu_sieve/sieve.l | 4 ++++
libproto/imap/Makefile.am | 2 +-
libproto/imap/folder.c | 4 +++-
libproto/imap/tests/Makefile.am | 2 +-
libproto/maildir/Makefile.am | 2 +-
libproto/mailer/Makefile.am | 2 +-
libproto/mbox/Makefile.am | 2 +-
libproto/mh/Makefile.am | 2 +-
libproto/nntp/Makefile.am | 2 +-
libproto/pop/Makefile.am | 2 +-
maidag/Makefile.am | 2 +-
maidag/lmtp.c | 10 +++++-----
mail/Makefile.am | 5 +++--
mail/send.c | 4 +---
mapi/Makefile.am | 2 +-
messages/Makefile.am | 2 +-
mh/Makefile.am | 7 +++++--
mh/comp.c | 2 +-
mh/folder.c | 16 +++++++---------
mh/mh_alias.l | 3 +++
mh/mhn.c | 2 --
mh/send.c | 5 +++--
mh/tests/Makefile.am | 2 +-
mimeview/Makefile.am | 8 ++++----
mimeview/mimetypes.l | 4 ++++
mimeview/mimetypes.y | 2 +-
movemail/Makefile.am | 2 +-
mu/Makefile.am | 2 +-
pop3d/Makefile.am | 2 +-
python/libmu_py/Makefile.am | 2 +-
python/mailutils/Makefile.am | 2 +-
readmsg/Makefile.am | 2 +-
sieve/Makefile.am | 2 +-
sql/Makefile.am | 2 +-
testsuite/Makefile.am | 2 +-
87 files changed, 154 insertions(+), 133 deletions(-)
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index 55c53a7..8d32bca 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -15,12 +15,13 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_APP_COMMON_INCLUDES@
SUBDIRS = . tests
sbin_PROGRAMS = comsatd
comsatd_SOURCES = action.c comsat.c comsat.h biff.rc.h
-AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
+AM_CPPFLAGS = \
+ @address@hidden
+ -DSYSCONFDIR=\"$(sysconfdir)\"
BUILT_SOURCES=biff.rc.h
EXTRA_DIST=biffrc.sed biff.rc
diff --git a/configure.ac b/configure.ac
index c298498..ca3c1e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,6 +308,8 @@ MU_CHECK_GNUTLS([1.2.1],[
AC_DEFINE(WITH_GNUTLS,1,[Define if mailutils is using GNU TLS])
AC_DEFINE(WITH_TLS,1,[Define if mailutils is using TLS])
status_gnutls=yes
+],[
+ status_gnutls=no
])
AC_SUBST(SITE_MAIL_RC)
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am
index 4cada26..5211af3 100644
--- a/dotlock/Makefile.am
+++ b/dotlock/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
bin_PROGRAMS = dotlock
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 4f0747e..e0076a4 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -55,7 +55,7 @@ EXTRA_PROGRAMS = nntpclient
address@hidden@
mod_LTLIBRARIES = numaddr.la
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
LDADD = \
../lib/libmuaux.a\
@@ -72,7 +72,7 @@ msg_send_LDADD =\
@address@hidden
${MU_LIB_MAILUTILS}
-mta_CPPFLAGS=-I${top_srcdir}/lib -I${top_builddir}/lib
address@hidden@ -I${top_srcdir}/lib -I${top_builddir}/lib
mta_LDADD =\
../lib/libmuaux.a\
${MU_LIB_MBOX}\
diff --git a/examples/base64.c b/examples/base64.c
index 0d9b66e..8f9e051 100644
--- a/examples/base64.c
+++ b/examples/base64.c
@@ -56,16 +56,14 @@ c_copy (mu_stream_t out, mu_stream_t in)
while (mu_stream_read (in, &c, 1, &size) == 0 && size > 0)
{
- int rc;
-
if (printable && !ISPRINT (c))
{
char outbuf[24];
sprintf (outbuf, "\\%03o", (unsigned char) c);
- rc = mu_stream_write (out, outbuf, strlen (outbuf), NULL);
+ MU_ASSERT (mu_stream_write (out, outbuf, strlen (outbuf), NULL));
}
else
- rc = mu_stream_write (out, &c, 1, NULL);
+ MU_ASSERT (mu_stream_write (out, &c, 1, NULL));
}
}
else
diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am
index 237da10..271ac05 100644
--- a/examples/cpp/Makefile.am
+++ b/examples/cpp/Makefile.am
@@ -31,7 +31,7 @@ MU_CXX_EXAMPLES_LIST = \
EXTRA_PROGRAMS=$(MU_CXX_EXAMPLES_LIST)
noinst_PROGRAMS = @MU_CXX_EXAMPLES_BUILD@
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
AM_LDFLAGS = \
../../lib/libmuaux.a\
diff --git a/examples/http.c b/examples/http.c
index 60d5a69..b54ab36 100644
--- a/examples/http.c
+++ b/examples/http.c
@@ -72,7 +72,7 @@ main (int argc, char **argv)
{
int ret;
mu_stream_t stream;
- size_t nb, size;
+ size_t nb;
size_t attempt;
char *url = "www.gnu.org";
@@ -110,7 +110,7 @@ main (int argc, char **argv)
exit (EXIT_FAILURE);
}
- for (attempt = 0, size = strlen (wbuf);; )
+ for (attempt = 0;; )
{
ret = mu_stream_write (stream, wbuf, strlen (wbuf), NULL);
if (ret == 0)
diff --git a/frm/Makefile.am b/frm/Makefile.am
index 8206dc8..1c30f26 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
SUBDIRS = . tests
diff --git a/gint b/gint
index a577435..fd86bf7 160000
--- a/gint
+++ b/gint
@@ -1 +1 @@
-Subproject commit a5774356a1c12d1bcb55b6322710e347e1604fc9
+Subproject commit fd86bf7d44b0c970771830692ae7491447ebe8b1
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index 7f982af..72b0574 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@
SUBDIRS = tests
sbin_PROGRAMS = imap4d
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6605984..559dd39 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -17,7 +17,7 @@
include gnulib.mk
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS += @MU_LIB_COMMON_INCLUDES@
libmuaux_a_SOURCES += \
argp_base.c\
diff --git a/lib/mailcap.c b/lib/mailcap.c
index 24ef3a0..795d3fe 100644
--- a/lib/mailcap.c
+++ b/lib/mailcap.c
@@ -423,13 +423,11 @@ create_filter (char *cmd, int outfd, int *infd)
{
/* Child process */
struct mu_wordsplit ws;
- int argc;
char **argv;
if (need_shell_p (cmd))
{
char *x_argv[4];
- argc = 3;
argv = x_argv;
argv[0] = getenv ("SHELL");
argv[1] = "-c";
@@ -444,7 +442,6 @@ create_filter (char *cmd, int outfd, int *infd)
mu_wordsplit_strerror (&ws));
_exit (127);
}
- argc = ws.ws_wordc;
argv = ws.ws_wordv;
}
/* Create input channel: */
@@ -541,7 +538,7 @@ run_mailcap (mu_mailcap_entry_t entry, struct mime_context
*ctx)
int fd;
int *pfd = NULL;
int outfd = -1;
- pid_t pid, pager_pid;
+ pid_t pid;
if (ctx->debug_level > 1)
dump_mailcap_entry (entry);
@@ -582,7 +579,7 @@ run_mailcap (mu_mailcap_entry_t entry, struct mime_context
*ctx)
flag = 0;
if (interactive_p (ctx)
&& mu_mailcap_entry_copiousoutput (entry, &flag) == 0 && flag)
- pager_pid = create_filter (get_pager (), -1, &outfd);
+ create_filter (get_pager (), -1, &outfd);
pid = create_filter (view_command, outfd, pfd);
if (pid > 0)
diff --git a/libmailutils/address/Makefile.am b/libmailutils/address/Makefile.am
index 86457fe..e8fcf0d 100644
--- a/libmailutils/address/Makefile.am
+++ b/libmailutils/address/Makefile.am
@@ -22,4 +22,4 @@ libaddress_la_SOURCES = \
addrstream.c\
parse822.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/auth/Makefile.am b/libmailutils/auth/Makefile.am
index 94c701d..02deb4e 100644
--- a/libmailutils/auth/Makefile.am
+++ b/libmailutils/auth/Makefile.am
@@ -22,4 +22,4 @@ libauth_la_SOURCES = \
mu_auth.c\
system.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/base/Makefile.am b/libmailutils/base/Makefile.am
index de518f4..c7052c3 100644
--- a/libmailutils/base/Makefile.am
+++ b/libmailutils/base/Makefile.am
@@ -71,15 +71,15 @@ libbase_la_SOURCES = \
localedir = $(datadir)/locale
AM_CPPFLAGS = \
+ @MU_LIB_COMMON_INCLUDES@ -I/libmailutils\
-DSYSCONFDIR=\"$(sysconfdir)\"\
-DSITE_VIRTUAL_PWDDIR=\"@address@hidden"\
-DLOCALEDIR=\"$(localedir)\"
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
AM_YFLAGS=-vt
-AM_LFLAGS=-dvp
+AM_LFLAGS=-dp
EXTRA_DIST = parsedate.y
diff --git a/libmailutils/base/amd.c b/libmailutils/base/amd.c
index 0340b12..4722adc 100644
--- a/libmailutils/base/amd.c
+++ b/libmailutils/base/amd.c
@@ -1216,7 +1216,7 @@ _compute_mailbox_size_recursive (struct _amd_data *amd,
const char *name,
free (buf);
closedir (dir);
- return 0;
+ return status;
}
static int
diff --git a/libmailutils/base/wicket.c b/libmailutils/base/wicket.c
index a7b691f..3b4c66f 100644
--- a/libmailutils/base/wicket.c
+++ b/libmailutils/base/wicket.c
@@ -177,28 +177,30 @@ file_ticket_get_cred (mu_ticket_t ticket, mu_url_t url,
const char *challenge,
char **pplain, mu_secret_t *psec)
{
struct file_ticket *ft = mu_ticket_get_data (ticket);
-
+ int rc = 0;
+
if (!ft->tickurl)
{
- int rc = mu_wicket_file_match_url (ft->filename, url,
- MU_URL_PARSE_ALL,
- &ft->tickurl);
+ rc = mu_wicket_file_match_url (ft->filename, url,
+ MU_URL_PARSE_ALL,
+ &ft->tickurl);
if (rc)
return rc;
- }
+ }
if (pplain)
{
if (ft->user)
{
*pplain = strdup (ft->user);
if (!*pplain)
- return ENOMEM;
+ rc = ENOMEM;
}
else
- return mu_url_aget_user (ft->tickurl, pplain);
+ rc = mu_url_aget_user (ft->tickurl, pplain);
}
else
- return mu_url_get_secret (ft->tickurl, psec);
+ rc = mu_url_get_secret (ft->tickurl, psec);
+ return rc;
}
static int
diff --git a/libmailutils/cfg/Makefile.am b/libmailutils/cfg/Makefile.am
index 8d6af99..bbe5699 100644
--- a/libmailutils/cfg/Makefile.am
+++ b/libmailutils/cfg/Makefile.am
@@ -26,10 +26,10 @@ libcfg_la_SOURCES = \
localedir = $(datadir)/locale
AM_CPPFLAGS = \
+ @MU_LIB_COMMON_INCLUDES@ -I/libmailutils\
-DSYSCONFDIR=\"$(sysconfdir)\"\
-DLOCALEDIR=\"$(localedir)\"
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
EXTRA_DIST = \
lexer.l\
@@ -40,7 +40,7 @@ BUILT_SOURCES = parser.c parser.h lexer.c
YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
AM_YFLAGS=-vt
-AM_LFLAGS=-dvp
+AM_LFLAGS=-dp
parser.c parser.h: $(srcdir)/parser.y
$(YLWRAP) "$(YACC) $(AM_YFLAGS) -d" $< \
diff --git a/libmailutils/cfg/lexer.l b/libmailutils/cfg/lexer.l
index 65ff65c..6e2d862 100644
--- a/libmailutils/cfg/lexer.l
+++ b/libmailutils/cfg/lexer.l
@@ -69,6 +69,9 @@ static mu_opool_t pool;
%}
+%option nounput
+%option noinput
+
%x COMMENT ML STR
WS [ \t\f][ \t\f]*
diff --git a/libmailutils/cidr/Makefile.am b/libmailutils/cidr/Makefile.am
index 3290e68..dede3f7 100644
--- a/libmailutils/cidr/Makefile.am
+++ b/libmailutils/cidr/Makefile.am
@@ -24,4 +24,4 @@ libcidr_la_SOURCES = \
tosa.c\
tostr.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/datetime/Makefile.am
b/libmailutils/datetime/Makefile.am
index 7c3392d..1ff282c 100644
--- a/libmailutils/datetime/Makefile.am
+++ b/libmailutils/datetime/Makefile.am
@@ -30,4 +30,4 @@ libdatetime_la_SOURCES = \
utcoff.c\
yd.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/diag/Makefile.am b/libmailutils/diag/Makefile.am
index a6dec7e..231fb52 100644
--- a/libmailutils/diag/Makefile.am
+++ b/libmailutils/diag/Makefile.am
@@ -26,7 +26,7 @@ libdiag_la_SOURCES = \
syslog.c\
wd.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
EXTRA_DIST = \
debcat\
diff --git a/libmailutils/filter/Makefile.am b/libmailutils/filter/Makefile.am
index 88ce88f..1dea8b3 100644
--- a/libmailutils/filter/Makefile.am
+++ b/libmailutils/filter/Makefile.am
@@ -35,5 +35,5 @@ libfilter_la_SOURCES =\
linelenflt.c\
qpflt.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libmailutils
diff --git a/libmailutils/imapio/Makefile.am b/libmailutils/imapio/Makefile.am
index a27ef08..f4340c7 100644
--- a/libmailutils/imapio/Makefile.am
+++ b/libmailutils/imapio/Makefile.am
@@ -40,4 +40,5 @@ libimapio_la_SOURCES = \
words.c\
xscript.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+
diff --git a/libmailutils/imapio/qstring.c b/libmailutils/imapio/qstring.c
index b47109f..b54f64b 100644
--- a/libmailutils/imapio/qstring.c
+++ b/libmailutils/imapio/qstring.c
@@ -71,6 +71,8 @@ mu_imapio_send_qstring_unfold (struct _mu_imapio *io, const
char *buffer,
int rc;
rc = mu_stream_write (io->_imap_stream, "\"", 1, NULL);
+ if (rc)
+ return rc;
while (1)
{
mu_stream_write (io->_imap_stream, buffer, len, NULL);
diff --git a/libmailutils/list/Makefile.am b/libmailutils/list/Makefile.am
index 20d5abc..0f82308 100644
--- a/libmailutils/list/Makefile.am
+++ b/libmailutils/list/Makefile.am
@@ -52,5 +52,5 @@ liblist_la_SOURCES = \
sort.c\
tail.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/list/locate.c b/libmailutils/list/locate.c
index 0959878..99cb440 100644
--- a/libmailutils/list/locate.c
+++ b/libmailutils/list/locate.c
@@ -32,7 +32,7 @@ _mu_list_ptr_comparator (const void *item, const void *value)
int
mu_list_locate (mu_list_t list, void *item, void **ret_item)
{
- struct list_data *current, *previous;
+ struct list_data *current;
mu_list_comparator_t comp;
int status = MU_ERR_NOENT;
@@ -40,8 +40,8 @@ mu_list_locate (mu_list_t list, void *item, void **ret_item)
return EINVAL;
comp = list->comp ? list->comp : _mu_list_ptr_comparator;
mu_monitor_wrlock (list->monitor);
- for (previous = &list->head, current = list->head.next;
- current != &list->head; previous = current, current = current->next)
+ for (current = list->head.next; current != &list->head;
+ current = current->next)
{
if (comp (current->item, item) == 0)
{
diff --git a/libmailutils/list/replace.c b/libmailutils/list/replace.c
index e3d5aec..d9aa7bc 100644
--- a/libmailutils/list/replace.c
+++ b/libmailutils/list/replace.c
@@ -26,7 +26,7 @@
int
mu_list_replace (mu_list_t list, void *old_item, void *new_item)
{
- struct list_data *current, *previous;
+ struct list_data *current;
mu_list_comparator_t comp;
int status = MU_ERR_NOENT;
@@ -34,8 +34,8 @@ mu_list_replace (mu_list_t list, void *old_item, void
*new_item)
return EINVAL;
comp = list->comp ? list->comp : _mu_list_ptr_comparator;
mu_monitor_wrlock (list->monitor);
- for (previous = &list->head, current = list->head.next;
- current != &list->head; previous = current, current = current->next)
+ for (current = list->head.next; current != &list->head;
+ current = current->next)
{
if (comp (current->item, old_item) == 0)
{
diff --git a/libmailutils/mailbox/Makefile.am b/libmailutils/mailbox/Makefile.am
index de263b8..a2a157d 100644
--- a/libmailutils/mailbox/Makefile.am
+++ b/libmailutils/mailbox/Makefile.am
@@ -56,4 +56,4 @@ libmailbox_la_SOURCES = \
msguid.c\
msguidl.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/mailer/Makefile.am b/libmailutils/mailer/Makefile.am
index 3eef716..f654187 100644
--- a/libmailutils/mailer/Makefile.am
+++ b/libmailutils/mailer/Makefile.am
@@ -21,4 +21,4 @@ libmailer_la_SOURCES = \
mailer.c\
progmailer.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/mime/Makefile.am b/libmailutils/mime/Makefile.am
index 0da2910..c7a1a1a 100644
--- a/libmailutils/mime/Makefile.am
+++ b/libmailutils/mime/Makefile.am
@@ -22,4 +22,4 @@ libmime_la_SOURCES = \
mime.c\
mimehdr.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/msgset/Makefile.am b/libmailutils/msgset/Makefile.am
index bbee47b..6490b46 100644
--- a/libmailutils/msgset/Makefile.am
+++ b/libmailutils/msgset/Makefile.am
@@ -41,5 +41,5 @@ libmsgset_la_SOURCES = \
subset.c\
trans.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/property/Makefile.am
b/libmailutils/property/Makefile.am
index 20a8a8b..6cd4aa6 100644
--- a/libmailutils/property/Makefile.am
+++ b/libmailutils/property/Makefile.am
@@ -27,4 +27,4 @@ libproperty_la_SOURCES = \
propinv.c\
propset.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/server/Makefile.am b/libmailutils/server/Makefile.am
index 1430fde..dab1aa3 100644
--- a/libmailutils/server/Makefile.am
+++ b/libmailutils/server/Makefile.am
@@ -23,4 +23,4 @@ libserver_la_SOURCES = \
msrv.c\
ipsrv.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/sockaddr/Makefile.am
b/libmailutils/sockaddr/Makefile.am
index 2396406..365f025 100644
--- a/libmailutils/sockaddr/Makefile.am
+++ b/libmailutils/sockaddr/Makefile.am
@@ -28,4 +28,4 @@ libsockaddr_la_SOURCES = \
unlink.c\
url.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/stdstream/Makefile.am
b/libmailutils/stdstream/Makefile.am
index dd15720..525b9f3 100644
--- a/libmailutils/stdstream/Makefile.am
+++ b/libmailutils/stdstream/Makefile.am
@@ -22,4 +22,4 @@ libstdstream_la_SOURCES = \
dbgstream.c\
strerr.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/stream/Makefile.am b/libmailutils/stream/Makefile.am
index 315081c..13a1779 100644
--- a/libmailutils/stream/Makefile.am
+++ b/libmailutils/stream/Makefile.am
@@ -40,4 +40,4 @@ libstream_la_SOURCES = \
temp_file_stream.c\
xscript-stream.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/string/Makefile.am b/libmailutils/string/Makefile.am
index 29291eb..fe7809a 100644
--- a/libmailutils/string/Makefile.am
+++ b/libmailutils/string/Makefile.am
@@ -40,4 +40,4 @@ libstring_la_SOURCES = \
wordsplit.c\
xdecode.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/tests/fltst.c b/libmailutils/tests/fltst.c
index ad9723f..591b8ac 100644
--- a/libmailutils/tests/fltst.c
+++ b/libmailutils/tests/fltst.c
@@ -51,16 +51,14 @@ c_copy (mu_stream_t out, mu_stream_t in)
while (mu_stream_read (in, &c, 1, &size) == 0 && size > 0)
{
- int rc;
-
if (printable && !ISPRINT (c))
{
char outbuf[24];
sprintf (outbuf, "\\%03o", (unsigned char) c);
- rc = mu_stream_write (out, outbuf, strlen (outbuf), NULL);
+ MU_ASSERT (mu_stream_write (out, outbuf, strlen (outbuf), NULL));
}
else
- rc = mu_stream_write (out, &c, 1, NULL);
+ MU_ASSERT (mu_stream_write (out, &c, 1, NULL));
}
}
else
diff --git a/libmailutils/tests/listop.c b/libmailutils/tests/listop.c
index 3f192bd..9349f8f 100644
--- a/libmailutils/tests/listop.c
+++ b/libmailutils/tests/listop.c
@@ -332,6 +332,8 @@ ictl_ins (mu_iterator_t itr, int argc, char **argv)
rc = mu_iterator_ctl (itr, mu_itrctl_insert_list, tmp);
mu_list_destroy (&tmp);
}
+ if (rc)
+ printf ("%s\n", mu_strerror (rc));
}
void
diff --git a/libmailutils/url/Makefile.am b/libmailutils/url/Makefile.am
index 8b94201..83db895 100644
--- a/libmailutils/url/Makefile.am
+++ b/libmailutils/url/Makefile.am
@@ -55,5 +55,5 @@ liburl_la_SOURCES = \
urlinv.c\
urlstr.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmu_argp/Makefile.am b/libmu_argp/Makefile.am
index c14b27d..5c8b29c 100644
--- a/libmu_argp/Makefile.am
+++ b/libmu_argp/Makefile.am
@@ -16,8 +16,8 @@
# This library uses gnulib calls and is always linked with gnulib, therefore
# we use application includes here.
-INCLUDES = @MU_APP_COMMON_INCLUDES@
AM_CPPFLAGS = \
+ @address@hidden
-DSYSCONFDIR=\"$(sysconfdir)\"\
-DSITE_VIRTUAL_PWDDIR=\"@address@hidden"\
-DSITE_CRAM_MD5_PWD=\"@address@hidden"
diff --git a/libmu_argp/muinit.c b/libmu_argp/muinit.c
index 5de8eb2..dd88f78 100644
--- a/libmu_argp/muinit.c
+++ b/libmu_argp/muinit.c
@@ -35,7 +35,7 @@ const char version_etc_copyright[] =
/* Do *not* mark this string for translation. %s is a copyright
symbol suitable for this locale, and %d is the copyright
year. */
- "Copyright %s 2010 Free Software Foundation, inc.";
+ "Copyright %s 2007-2014 Free Software Foundation, inc.";
void
mu_program_version_hook (FILE *stream, struct argp_state *state)
diff --git a/libmu_auth/Makefile.am b/libmu_auth/Makefile.am
index 76bb28c..d7ee0d0 100644
--- a/libmu_auth/Makefile.am
+++ b/libmu_auth/Makefile.am
@@ -15,9 +15,10 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
-AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@address@hidden" \
- -DSITE_CRAM_MD5_PWD=\"@address@hidden"
+AM_CPPFLAGS = \
+ @address@hidden
+ -DSITE_VIRTUAL_PWDDIR=\"@address@hidden" \
+ -DSITE_CRAM_MD5_PWD=\"@address@hidden"
lib_LTLIBRARIES = libmu_auth.la
diff --git a/libmu_cfg/Makefile.am b/libmu_cfg/Makefile.am
index 0175e60..bd21bb6 100644
--- a/libmu_cfg/Makefile.am
+++ b/libmu_cfg/Makefile.am
@@ -14,9 +14,10 @@
# You should have received a copy of the GNU General Public License
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
-AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@address@hidden" \
- -DSITE_CRAM_MD5_PWD=\"@address@hidden"
+AM_CPPFLAGS = \
+ @address@hidden
+ -DSITE_VIRTUAL_PWDDIR=\"@address@hidden" \
+ -DSITE_CRAM_MD5_PWD=\"@address@hidden"
lib_LTLIBRARIES = libmu_cfg.la
libmu_cfg_la_SOURCES=\
diff --git a/libmu_compat/Makefile.am b/libmu_compat/Makefile.am
index eee59be..65f4efa 100644
--- a/libmu_compat/Makefile.am
+++ b/libmu_compat/Makefile.am
@@ -22,5 +22,5 @@ libmu_compat_la_SOURCES = \
filter_iconv.c\
vartab.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmu_compat/tests/Makefile.am b/libmu_compat/tests/Makefile.am
index d48c2ad..60cc012 100644
--- a/libmu_compat/tests/Makefile.am
+++ b/libmu_compat/tests/Makefile.am
@@ -38,7 +38,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
## Non-installable programs
## -------------------------- ##
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
noinst_PROGRAMS = argcv
LDADD = ../libmu_compat.la ${MU_LIB_MAILUTILS}
diff --git a/libmu_cpp/Makefile.am b/libmu_cpp/Makefile.am
index cae14f9..85977d4 100644
--- a/libmu_cpp/Makefile.am
+++ b/libmu_cpp/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_cpp.la
diff --git a/libmu_dbm/Makefile.am b/libmu_dbm/Makefile.am
index c1660f8..0a14725 100644
--- a/libmu_dbm/Makefile.am
+++ b/libmu_dbm/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ @DBMINCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ @DBMINCLUDES@
lib_LTLIBRARIES = libmu_dbm.la
diff --git a/libmu_scm/Makefile.am b/libmu_scm/Makefile.am
index 8dfad6c..95df328 100644
--- a/libmu_scm/Makefile.am
+++ b/libmu_scm/Makefile.am
@@ -17,7 +17,7 @@
SUBDIRS = . mailutils
-INCLUDES = -I. @MU_LIB_COMMON_INCLUDES@ @GUILE_INCLUDES@
+AM_CPPFLAGS = -I. @MU_LIB_COMMON_INCLUDES@ @GUILE_INCLUDES@
lib_LTLIBRARIES=libmu_scm.la
@@ -93,4 +93,5 @@ sitedir = @GUILE_SITE@/$(PACKAGE)
site_DATA =
SUFFIXES=
BUILT_SOURCES=
+MAINTAINERCLEANFILES=
include ../gint/gint.mk
diff --git a/libmu_sieve/Makefile.am b/libmu_sieve/Makefile.am
index 926fe03..a2aff86 100644
--- a/libmu_sieve/Makefile.am
+++ b/libmu_sieve/Makefile.am
@@ -15,11 +15,11 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
-
YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
AM_YFLAGS = -dtv
-AM_CPPFLAGS = -DMU_SIEVE_MODDIR=\"@address@hidden"
+AM_CPPFLAGS =\
+ @address@hidden
+ -DMU_SIEVE_MODDIR=\"@address@hidden"
SUBDIRS = . extensions
diff --git a/libmu_sieve/extensions/Makefile.am
b/libmu_sieve/extensions/Makefile.am
index edf523b..50c0844 100644
--- a/libmu_sieve/extensions/Makefile.am
+++ b/libmu_sieve/extensions/Makefile.am
@@ -25,7 +25,7 @@ mod_LTLIBRARIES = \
timestamp.la\
vacation.la
-INCLUDES = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
AM_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)'
diff --git a/libmu_sieve/sieve.l b/libmu_sieve/sieve.l
index 742ef7f..279849b 100644
--- a/libmu_sieve/sieve.l
+++ b/libmu_sieve/sieve.l
@@ -213,6 +213,10 @@ pop_source ()
return 0;
}
%}
+
+%option nounput
+%option noinput
+
%x COMMENT ML STR
WS [ \t][ \t]*
diff --git a/libproto/imap/Makefile.am b/libproto/imap/Makefile.am
index 8182c18..0b1c156 100644
--- a/libproto/imap/Makefile.am
+++ b/libproto/imap/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_imap.la
libmu_imap_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/imap/folder.c b/libproto/imap/folder.c
index a2caa6d..2369622 100644
--- a/libproto/imap/folder.c
+++ b/libproto/imap/folder.c
@@ -64,9 +64,11 @@ _mu_folder_preauth_callback (void *data, int code, size_t
sdat, void *pdat)
static void
_mu_folder_bye_callback (void *data, int code, size_t sdat, void *pdat)
{
+#if 0
mu_folder_t folder = data;
- const char *text = pdat;
mu_imap_t imap = folder->data;
+#endif
+ const char *text = pdat;
mu_debug (MU_DEBCAT_FOLDER, MU_DEBUG_TRACE1,
(_("IMAP server closing connection: %s"), text));
/*FIXME: mu_imap_disconnect (imap);*/
diff --git a/libproto/imap/tests/Makefile.am b/libproto/imap/tests/Makefile.am
index 3fc3c6f..b7014f7 100644
--- a/libproto/imap/tests/Makefile.am
+++ b/libproto/imap/tests/Makefile.am
@@ -18,7 +18,7 @@
noinst_PROGRAMS = \
imapfolder
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
LDADD = \
@address@hidden
@address@hidden
diff --git a/libproto/maildir/Makefile.am b/libproto/maildir/Makefile.am
index 0c03e7a..9dfd610 100644
--- a/libproto/maildir/Makefile.am
+++ b/libproto/maildir/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_maildir.la
libmu_maildir_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/mailer/Makefile.am b/libproto/mailer/Makefile.am
index 9a05ea2..774df4f 100644
--- a/libproto/mailer/Makefile.am
+++ b/libproto/mailer/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_mailer.la
libmu_mailer_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/mbox/Makefile.am b/libproto/mbox/Makefile.am
index aef6091..496011e 100644
--- a/libproto/mbox/Makefile.am
+++ b/libproto/mbox/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_mbox.la
libmu_mbox_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/mh/Makefile.am b/libproto/mh/Makefile.am
index 8b1b052..ac7b79c 100644
--- a/libproto/mh/Makefile.am
+++ b/libproto/mh/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_mh.la
libmu_mh_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/nntp/Makefile.am b/libproto/nntp/Makefile.am
index 5150a85..6e38101 100644
--- a/libproto/nntp/Makefile.am
+++ b/libproto/nntp/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_nntp.la
libmu_nntp_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/pop/Makefile.am b/libproto/pop/Makefile.am
index 04d2f25..decdb7d 100644
--- a/libproto/pop/Makefile.am
+++ b/libproto/pop/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_pop.la
libmu_pop_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/maidag/Makefile.am b/maidag/Makefile.am
index ebe81b6..3395845 100644
--- a/maidag/Makefile.am
+++ b/maidag/Makefile.am
@@ -54,7 +54,7 @@ maidag_LDADD = \
@address@hidden
@TCPWRAP_LIBRARIES@
-INCLUDES = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
+AM_CPPFLAGS = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
@PYTHON_INCLUDES@
install-exec-hook:
diff --git a/maidag/lmtp.c b/maidag/lmtp.c
index f69a5ac..c7e4ab0 100644
--- a/maidag/lmtp.c
+++ b/maidag/lmtp.c
@@ -654,18 +654,18 @@ int
maidag_lmtp_server ()
{
int rc = lmtp_set_privs ();
+
if (rc)
return rc;
if (mu_m_server_mode (server) == MODE_DAEMON)
{
- int status;
mu_m_server_begin (server);
- status = mu_m_server_run (server);
+ rc = mu_m_server_run (server);
+ if (rc)
+ rc = EX_CONFIG;
mu_m_server_end (server);
mu_m_server_destroy (&server);
- if (status)
- return EX_CONFIG;
}
else
{
@@ -701,6 +701,6 @@ maidag_lmtp_server ()
rc = lmtp_loop (str, 0);
mu_stream_destroy (&str);
- return rc;
}
+ return rc;
}
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 2833189..e0f8eed 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -16,8 +16,9 @@
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
AM_YFLAGS=-vt
-INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
-AM_CFLAGS = -DSITE_MAIL_RC=\"@address@hidden"
+AM_CPPFLAGS = \
+ @MU_APP_COMMON_INCLUDES@ @address@hidden
+ -DSITE_MAIL_RC=\"@address@hidden"
address@hidden@
diff --git a/mail/send.c b/mail/send.c
index dbf5d34..abab4c4 100644
--- a/mail/send.c
+++ b/mail/send.c
@@ -915,7 +915,6 @@ mail_send0 (compose_env_t *env, int save_to)
else
{
struct mu_wordsplit ws;
- int status;
if (mu_wordsplit (buf + 1, &ws, MU_WRDSF_DEFFLAGS) == 0)
{
@@ -925,8 +924,7 @@ mail_send0 (compose_env_t *env, int save_to)
mail_find_escape (ws.ws_wordv[0]);
if (entry)
- status = (*entry->escfunc) (ws.ws_wordc, ws.ws_wordv,
- env);
+ (*entry->escfunc) (ws.ws_wordc, ws.ws_wordv, env);
else
mu_error (_("Unknown escape %s"), ws.ws_wordv[0]);
}
diff --git a/mapi/Makefile.am b/mapi/Makefile.am
index 9ff8ad2..ea1d996 100644
--- a/mapi/Makefile.am
+++ b/mapi/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
SUBDIRS = include
diff --git a/messages/Makefile.am b/messages/Makefile.am
index 1d5d3ae..5e9213b 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
SUBDIRS = . tests
diff --git a/mh/Makefile.am b/mh/Makefile.am
index 9910af3..22857e9 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -99,8 +99,11 @@ EXTRA_DIST = mh_fmtgram.y pick.y mh_alias.y mh_alias.l
mhlibdir = $(pkgdatadir)/mh
-INCLUDES = @MU_APP_COMMON_INCLUDES@
-AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
+AM_CPPFLAGS =\
+ @address@hidden
+ -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\"\
+ -DMHBINDIR=\"$(bindir)\"
+
mh_LIBS = \
./libmh.a\
../lib/libmuaux.a\
diff --git a/mh/comp.c b/mh/comp.c
index 6066de0..02a23cf 100644
--- a/mh/comp.c
+++ b/mh/comp.c
@@ -258,7 +258,7 @@ main (int argc, char **argv)
mu_error (_("only one message at a time!"));
return 1;
}
- draftmessage = mu_umaxtostr (0, mh_msgset_first_uid (msgset));
+ draftmessage = (char*) mu_umaxtostr (0, mh_msgset_first_uid
(msgset));
mu_msgset_free (msgset);
mu_mailbox_destroy (&mbox);
}
diff --git a/mh/folder.c b/mh/folder.c
index 1210856..0810a29 100644
--- a/mh/folder.c
+++ b/mh/folder.c
@@ -246,7 +246,7 @@ size_t message_count; /* Total number of
messages */
int name_prefix_len; /* Length of the mu_path_folder_dir */
void
-install_folder_info (const char *name, struct folder_info *info)
+install_folder_info (const char *name, struct folder_info const *info)
{
struct folder_info *new_info = mu_alloc (sizeof (*new_info));
*new_info = *info;
@@ -315,7 +315,7 @@ _scan (const char *name, size_t depth)
if (fast_mode && depth > 0)
{
memset (&info, 0, sizeof (info));
- info.name = name;
+ info.name = (char*) name;
install_folder_info (name, &info);
closedir (dir);
return;
@@ -770,7 +770,7 @@ pack_xlate (struct pack_tab *pack_tab, size_t count, size_t
n)
return p ? p->new : 0;
}
-static int
+static void
_fixup (const char *name, const char *value, struct fixup_data *fd, int flags)
{
size_t i;
@@ -785,7 +785,7 @@ _fixup (const char *name, const char *value, struct
fixup_data *fd, int flags)
{
mu_error (_("cannot split line `%s': %s"), value,
mu_wordsplit_strerror (&ws));
- return 0;
+ return;
}
rc = mu_msgset_create (&msgset, fd->mbox, MU_MSGSET_UID);
@@ -820,14 +820,13 @@ _fixup (const char *name, const char *value, struct
fixup_data *fd, int flags)
const char *p = mh_seq_read (fd->mbox, name, flags);
fprintf (stderr, "Sequence %s: %s\n", name, p);
}
-
- return 0;
}
static int
fixup_global (const char *name, const char *value, void *data)
{
- return _fixup (name, value, data, 0);
+ _fixup (name, value, data, 0);
+ return 0;
}
static int
@@ -842,11 +841,10 @@ fixup_private (const char *name, const char *value, void
*data)
nlen = strlen (name) - strlen (fd->folder_dir);
if (nlen > 0 && strcmp (name + nlen, fd->folder_dir) == 0)
{
- int rc;
char *s = mu_alloc (nlen);
memcpy (s, name, nlen - 1);
s[nlen-1] = 0;
- rc = _fixup (s, value, fd, SEQ_PRIVATE);
+ _fixup (s, value, fd, SEQ_PRIVATE);
free (s);
}
return 0;
diff --git a/mh/mh_alias.l b/mh/mh_alias.l
index e54bf4e..ffb2e28 100644
--- a/mh/mh_alias.l
+++ b/mh/mh_alias.l
@@ -370,6 +370,9 @@ pop_source ()
extern int yyparse (void);
%}
+%option nounput
+%option noinput
+
WS [ \t]+
WORD [^ \t\n,:;<+=\*]+
SPEC [,:;+=\*]
diff --git a/mh/mhn.c b/mh/mhn.c
index 9e0e7e1..d307b23 100644
--- a/mh/mhn.c
+++ b/mh/mhn.c
@@ -1936,7 +1936,6 @@ parse_content_type (struct compose_env *env,
{
int status = 0, stop = 0;
char *rest = *prest;
- char *sp;
char *comment = NULL;
while (stop == 0 && status == 0 && *rest)
@@ -1993,7 +1992,6 @@ parse_content_type (struct compose_env *env,
mu_opool_append_char (pool, ';');
mu_opool_append_char (pool, ' ');
skipws (rest);
- sp = rest;
for (; *rest && !mu_isspace (*rest) && *rest != '='; rest++)
mu_opool_append_char (pool, *rest);
skipws (rest);
diff --git a/mh/send.c b/mh/send.c
index 244c1a8..8f26ec6 100644
--- a/mh/send.c
+++ b/mh/send.c
@@ -879,8 +879,9 @@ main (int argc, char **argv)
if (mu_list_is_empty (mesg_list) && argc == 0)
{
char *dfolder =
- (!use_draft && use_draftfolder) ?
- mh_global_profile_get ("Draft-Folder", NULL) : NULL;
+ (!use_draft && use_draftfolder)
+ ? (char*) mh_global_profile_get ("Draft-Folder", NULL)
+ : NULL;
if (dfolder)
addfolder (dfolder, 0, NULL);
diff --git a/mh/tests/Makefile.am b/mh/tests/Makefile.am
index 9dbd75c..7de0985 100644
--- a/mh/tests/Makefile.am
+++ b/mh/tests/Makefile.am
@@ -38,7 +38,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
## Non-installable programs ##
## -------------------------- ##
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
noinst_PROGRAMS = lu
## ------------ ##
diff --git a/mimeview/Makefile.am b/mimeview/Makefile.am
index c0dbc66..8697531 100644
--- a/mimeview/Makefile.am
+++ b/mimeview/Makefile.am
@@ -15,9 +15,10 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_APP_COMMON_INCLUDES@
-
-AM_CFLAGS = -DDEFAULT_CUPS_CONFDIR=\"@address@hidden"
+AM_CPPFLAGS = \
+ @address@hidden
+ -D_GNU_SOURCE=1\
+ -DDEFAULT_CUPS_CONFDIR=\"@address@hidden"
bin_PROGRAMS = mimeview
mimeview_SOURCES = \
@@ -30,7 +31,6 @@ mimeview_SOURCES = \
YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
AM_YFLAGS=-vt
AM_LEXFLAGS=-d
-AM_CPPFLAGS=-D_GNU_SOURCE=1
EXTRA_DIST = mimetypes.y mimetypes.l
mimetypes-gram.c mimetypes-decl.h: $(srcdir)/mimetypes.y
diff --git a/mimeview/mimetypes.l b/mimeview/mimetypes.l
index c28818a..c90cc0c 100644
--- a/mimeview/mimetypes.l
+++ b/mimeview/mimetypes.l
@@ -44,6 +44,10 @@ digit_to_number (char c)
c-'a'+10);
}
%}
+
+%option nounput
+%option noinput
+
%x ARGS HEX
X [0-9a-fA-F]
IDENT [a-zA-Z_\.][a-zA-Z0-9_\.-]*
diff --git a/mimeview/mimetypes.y b/mimeview/mimetypes.y
index 5ad8d53..8c12823 100644
--- a/mimeview/mimetypes.y
+++ b/mimeview/mimetypes.y
@@ -231,7 +231,7 @@ mimetypes_parse (const char *name)
return 1;
rc = yyparse ();
mimetypes_close ();
- return rule_list == NULL;
+ return rc || rule_list == NULL;
}
void
diff --git a/movemail/Makefile.am b/movemail/Makefile.am
index dba0fc2..0f23844 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
bin_PROGRAMS = movemail
movemail_LDADD = \
diff --git a/mu/Makefile.am b/mu/Makefile.am
index 7d4fe8e..0729439 100644
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@@ -98,8 +98,8 @@ mu_LDADD = \
${LIBMU_DBM} @address@hidden
@READLINE_LIBS@ @MU_COMMON_LIBRARIES@
-INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
AM_CPPFLAGS = \
+ @MU_APP_COMMON_INCLUDES@ @address@hidden
-DCOMPILE_FLAGS="\"-I$(includedir)\"" \
-DLINK_FLAGS="\"-L$(libdir)\"" \
-DLINK_POSTFLAGS="\"$(MU_LINK_POSTFLAGS)\"" \
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index ddb0739..5a5e878 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
sbin_PROGRAMS = pop3d
bin_PROGRAMS = @POPAUTH@
diff --git a/python/libmu_py/Makefile.am b/python/libmu_py/Makefile.am
index b41df9e..13b2f31 100644
--- a/python/libmu_py/Makefile.am
+++ b/python/libmu_py/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ $(PYTHON_INCLUDES)
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ $(PYTHON_INCLUDES)
lib_LTLIBRARIES=libmu_py.la
libmu_py_la_SOURCES = \
diff --git a/python/mailutils/Makefile.am b/python/mailutils/Makefile.am
index 9993bb7..0206d13 100644
--- a/python/mailutils/Makefile.am
+++ b/python/mailutils/Makefile.am
@@ -45,5 +45,5 @@ c_api_la_LDFLAGS = -avoid-version -module -rpath
$(pythonexecdir)
c_api_la_LIBADD = $(PYTHON_LIBS) ${MU_LIB_PY}
c_api_la_SOURCES = c_api.c
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ @address@hidden
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ @address@hidden
-I$(top_srcdir)/python/libmu_py
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index 206513d..e270e89 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
SUBDIRS = . tests
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index 66b8524..2c4e7c7 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-INCLUDES = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
SUBDIRS = . tests
EXTRA_DIST = examples
diff --git a/sql/Makefile.am b/sql/Makefile.am
index a7a1931..51f7099 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST=\
postgres.c
DISTCLEANFILES = modlist.h
-INCLUDES= @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
libsql_la_SOURCES=sql.c
address@hidden@
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index bca3285..e64b9c5 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -48,7 +48,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
## Non-installable programs
## -------------------------- ##
-INCLUDES = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
noinst_PROGRAMS = \
bs\
fldel\
hooks/post-receive
--
GNU Mailutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Mailutils branch, master, updated. release-2.2-672-g25df227,
Sergey Poznyakoff <=