lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae7b98c36e85beca8261046e20416033a2e3b84b..68a7d9025e08a97373ec4607b8295b628c39595d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,9 +166,7 @@ TESTS = \
     test/whom/test-whom \
     test/cleanup ## The "cleanup" test should always be last.
 
     test/whom/test-whom \
     test/cleanup ## The "cleanup" test should always be last.
 

-XFAIL_TESTS = \
-    test/inc/test-eom-align \
-    #
+XFAIL_TESTS =

 
 check_SCRIPTS = test/common.sh
 
 
 check_SCRIPTS = test/common.sh
 


@@ -360,6 +358,7 @@ noinst_HEADERS = \
     h/tws.h \
     h/utils.h \
     mts/smtp/smtp.h \
     h/tws.h \
     h/utils.h \
     mts/smtp/smtp.h \

+    sbr/base64.h \

     sbr/ctype-checked.h \
     sbr/lock_file.h \
     sbr/m_maildir.h \
     sbr/ctype-checked.h \
     sbr/lock_file.h \
     sbr/m_maildir.h \


@@ -369,9 +368,12 @@ noinst_HEADERS = \
     sbr/makedir.h \
     sbr/message_id.h \
     sbr/mime_type.h \
     sbr/makedir.h \
     sbr/message_id.h \
     sbr/mime_type.h \

+    sbr/read_line.h \
+    sbr/terminal.h \

     sbr/unquote.h \
     thirdparty/jsmn/jsmn.h \
     uip/mhfree.h \
     sbr/unquote.h \
     thirdparty/jsmn/jsmn.h \
     uip/mhfree.h \

+    uip/mhmisc.h \

     uip/mhoutsbr.h \
     uip/mhshowsbr.h \
     #
     uip/mhoutsbr.h \
     uip/mhshowsbr.h \
     #


@@ -873,7 +875,6 @@ config/version.c: Makefile $(srcdir)/config/version.sh
        env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
 etc/bash_completion_nmh: $(srcdir)/etc/bash_completion_nmh-gen
        env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
 etc/bash_completion_nmh: $(srcdir)/etc/bash_completion_nmh-gen

-       $(MKDIR_P) $(@D) # FIXME: A better way?

        $(srcdir)/etc/bash_completion_nmh-gen > $@
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
        $(srcdir)/etc/bash_completion_nmh-gen > $@
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile


@@ -886,7 +887,6 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
                                < $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
                                < $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)

-       $(MKDIR_P) $(@D) # FIXME: A better way?

        @rm -f $@
        $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
        @rm -f $@
        $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 


@@ -1148,7 +1148,7 @@ ChangeLog:
 ## Our RPM build target
 ##
 rpm: dist
 ## Our RPM build target
 ##
 rpm: dist

-       @test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
+       @$(MKDIR_P) $(rpmdir)/SOURCES

        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
        @cp -p VERSION $(rpmdir)/SOURCES
        @rpmbuild --define '_topdir $(rpmdir)' \
        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
        @cp -p VERSION $(rpmdir)/SOURCES
        @rpmbuild --define '_topdir $(rpmdir)' \