[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 196f9810eda97012980606456d5a8b429501bd9d

[Ken Hornstein]

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 "The nmh Mail Handling System".

The branch, master has been updated
       via  196f9810eda97012980606456d5a8b429501bd9d (commit)
       via  07808bdbf87f2caf032bfbe8f47fa6c1ab851332 (commit)
       via  d2272611c4877d55e7159d45f8f7de4d8b66e5cd (commit)
       via  3d7026ec516097979e9e07ea1c868f31e930bff9 (commit)
       via  20638d1b033f5f083bef65d51a0a5ff6642c3069 (commit)
      from  2a1a6bda2b5a7fd8fd79cdf60ee86a02c2d55107 (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=196f9810eda97012980606456d5a8b429501bd9d


commit 196f9810eda97012980606456d5a8b429501bd9d
Author: Ken Hornstein <address@hidden>
Date:   Fri Feb 3 15:38:49 2012 -0500

    Convert from the poorly-named and confusing adrsprintf() to getlocaladdr().

diff --git a/h/addrsbr.h b/h/addrsbr.h
index a6c7a41..2611e5a 100644
--- a/h/addrsbr.h
+++ b/h/addrsbr.h
@@ -35,6 +35,6 @@ struct mailname {
 void mnfree(struct mailname *);
 int ismymbox(struct mailname *);
 char *getname(char *);
-char *adrsprintf(char *, char *);
+char *getlocaladdr(void);
 char *auxformat(struct mailname *, int);
 struct mailname *getm(char *, char *, int, int, char *);
diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 7d1350e..07bc810 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -287,17 +287,20 @@ auxformat (struct mailname *mp, int extras)
 
 
 /*
- * address specific "sprintf"
+ * This used to be adrsprintf() (where it would format an address for you
+ * given a username and a domain).  But somewhere we got to the point where
+ * the only caller was post, and it only called it with both arguments NULL.
+ * So the function was renamed with a more sensible name.
  */
 
 char *
-adrsprintf (char *username, char *domain)
+getlocaladdr(void)
 {
     int          snprintf_return;
+    char        *username, *domain;
     static char  addr[BUFSIZ];
 
-    if (username == NULL)
-       username = getusername();
+    username = getusername();
 
     if (username_extension_masquerading) {
        /* mts.conf contains "masquerade:[...]username_extension[...]", so tack
@@ -324,8 +327,7 @@ adrsprintf (char *username, char *domain)
 
     return username;
 
-    if (domain == NULL)
-       domain = LocalName();
+    domain = LocalName();
 
     snprintf_return = snprintf (addr, sizeof(addr), "address@hidden", 
username, domain);
 
diff --git a/uip/post.c b/uip/post.c
index 2449d5f..dcd563b 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -868,7 +868,7 @@ start_headers (void)
     mygid = getgid ();
     time (&tclock);
 
-    strncpy (from, adrsprintf (NULL, NULL), sizeof(from));
+    strncpy (from, getlocaladdr(), sizeof(from));
     strncpy (myhost, LocalName (), sizeof(myhost));
 
     for (cp = myhost; *cp; cp++)
@@ -877,7 +877,7 @@ start_headers (void)
     if ((cp = getfullname ()) && *cp) {
        strncpy (sigbuf, cp, sizeof(sigbuf));
        snprintf (signature, sizeof(signature), "%s <%s>",
-               sigbuf, adrsprintf (NULL, NULL));
+               sigbuf, getlocaladdr());
        if ((cp = getname (signature)) == NULL)
            adios (NULL, "getname () failed -- you lose extraordinarily big");
        if ((mp = getm (cp, NULL, 0, AD_HOST, NULL)) == NULL)
@@ -886,7 +886,7 @@ start_headers (void)
        while (getname (""))
            continue;
     } else {
-       strncpy (signature, adrsprintf (NULL, NULL), sizeof(signature));
+       strncpy (signature, getlocaladdr(), sizeof(signature));
     }
 }
 

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=07808bdbf87f2caf032bfbe8f47fa6c1ab851332


commit 07808bdbf87f2caf032bfbe8f47fa6c1ab851332
Author: Ken Hornstein <address@hidden>
Date:   Fri Feb 3 15:03:00 2012 -0500

    Make the upload target phony.

diff --git a/Makefile.am b/Makefile.am
index e43f9bc..fc2e621 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -533,3 +533,4 @@ upload: dist
        fi
        @echo "Uploading to savannah"
        scp -p $(DIST_ARCHIVES)* 
$(SAVANNAH_USERNAME)@savannah.gnu.org:/releases/nmh
+.PHONY: upload

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=d2272611c4877d55e7159d45f8f7de4d8b66e5cd


commit d2272611c4877d55e7159d45f8f7de4d8b66e5cd
Author: Ken Hornstein <address@hidden>
Date:   Fri Feb 3 15:01:50 2012 -0500

    Beginnings of an upload Makefile target.

diff --git a/Makefile.am b/Makefile.am
index cd3c886..e43f9bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,11 +173,6 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk 
etc/mts.conf.in etc/sendfiles.in \
 ## overrides that are used to select different library options from the
 ## default.
 ##
-## Note that a few programs link in extra files (specifically, popsbr.c)
-## if POP3 support is compiled in.  An Automake conditional is used for
-## this purpose.
-##
-
 uip_ali_SOURCES = uip/ali.c uip/aliasbr.c
 
 uip_anno_SOURCES = uip/anno.c uip/annosbr.c
@@ -515,3 +510,26 @@ rpm: dist
 cscope:
        echo "-I $(srcdir)/h -I $(srcdir)/sbr -I $(srcdir)/uip -I 
$(srcdir)/mts/smtp" > cscope.files
        find $(srcdir) \( -name \*.c -o -name \*.l \) -print | grep -v dtimep.c 
>> cscope.files
+
+##
+## Rules to upload the distribution to savannah
+##
+
+upload: dist
+       @if test -z "$(SAVANNAH_USERNAME)"; then \
+               echo "You need to set SAVANNAH_USERNAME to the your username on 
savannah.gnu.org." ;\
+               echo "You can set it either in your environment or on the make 
command line."; \
+               false; \
+       fi
+       @echo "Did you run 'make distcheck' already?"
+       @if test -z "$(SKIP_GPG_SIG)"; then \
+               echo "Creating GPG signature (set SKIP_GPG_SIG to bypass this 
step)"; \
+               gpg --output $(DIST_ARCHIVES).sig --detatch-sig 
$(DIST_ARCHIVES); \
+       fi
+       @echo "Setting permissions for savannah.gnu.org"
+       chmod 664 $(DIST_ARCHIVES)
+       if test -f $(DIST_ARCHIVES).sig; then \
+               chmod 664 $(DIST_ARCHIVES).sig; \
+       fi
+       @echo "Uploading to savannah"
+       scp -p $(DIST_ARCHIVES)* 
$(SAVANNAH_USERNAME)@savannah.gnu.org:/releases/nmh

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=3d7026ec516097979e9e07ea1c868f31e930bff9


commit 3d7026ec516097979e9e07ea1c868f31e930bff9
Author: Ken Hornstein <address@hidden>
Date:   Fri Feb 3 13:50:19 2012 -0500

    Update with new features.

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index e6de6fd..c48e5df 100644
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -17,3 +17,7 @@ Things to add to the release notes for the next full release:
 - New format instructions %(putlit) and %(concataddr) have been implemented.
 - The --enable-pop configure option has been removed; POP support is now
   compiled in always.
+- You can now filter the body of a message through a user-defined filter
+  program inside of repl (the idea is that it will be used by repl).
+  See mhl(1), specifically the "format" keyword and "formatproc" in
+  mh-profile(5).

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=20638d1b033f5f083bef65d51a0a5ff6642c3069


commit 20638d1b033f5f083bef65d51a0a5ff6642c3069
Author: Ken Hornstein <address@hidden>
Date:   Fri Feb 3 13:49:46 2012 -0500

    Document the formatproc entry.

diff --git a/man/mh-profile.man b/man/mh-profile.man
index 0cdab08..f71c6f1 100644
--- a/man/mh-profile.man
+++ b/man/mh-profile.man
@@ -355,6 +355,16 @@ response to the
 directive at the \*(lqWhat now?\*(rq prompt.
 .RE
 .PP
+.BR formatproc :
+.RS 5
+Program called by
+.B mhl
+to filter a component when it is tagged with the \*(lqformat\*(rq variable
+in the mhl filter.  See 
+.BR mhl (5)
+for more information.
+.RE
+.PP
 .BR incproc :
 %bindir%/inc
 .RS 5

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                |   29 ++++++++++++++++++++++++-----
 docs/pending-release-notes |    4 ++++
 h/addrsbr.h                |    2 +-
 man/mh-profile.man         |   10 ++++++++++
 sbr/addrsbr.c              |   14 ++++++++------
 uip/post.c                 |    6 +++---
 6 files changed, 50 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System