[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated
|
From: |
Ken Hornstein |
|
Subject: |
[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. a80e3521e108c8c625c40595453e235e43d84800 |
|
Date: |
Wed, 29 Feb 2012 13:52:59 +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 "The nmh Mail Handling System".
The branch, master has been updated
via a80e3521e108c8c625c40595453e235e43d84800 (commit)
via 4d87cf4cd1673a5464c37e56b94aa3ce4c0db4a7 (commit)
via c8f2ee90aba3d5db2cbf170b3c2f7e4ea1d84aeb (commit)
via 99d483daa9db000183219129893ee2fd21961aae (commit)
via 7efaea5e53d58f4d8c5b5217ecc4974b62a62eea (commit)
via f5cbbbb68314176516f689cabf693ed49792d900 (commit)
via df6971a59e8d01dcfe605bbac949b7d4b3ab0a92 (commit)
from 9b152e23db633c49c43313a2ef26ebc0951cc874 (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=a80e3521e108c8c625c40595453e235e43d84800
commit a80e3521e108c8c625c40595453e235e43d84800
Author: Ken Hornstein <address@hidden>
Date: Wed Feb 29 08:52:26 2012 -0500
Fix a segfault that happens when using the -file option.
diff --git a/uip/dist.c b/uip/dist.c
index 807eb78..20ae318 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -303,7 +303,7 @@ try_it_again:
msgnam = file ? file : getcpy (m_name (mp->lowsel));
- dat[0] = mp->lowsel;
+ dat[0] = mp ? mp->lowsel : 0;
dat[1] = 0;
dat[2] = 0;
dat[3] = outputlinelen;
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=4d87cf4cd1673a5464c37e56b94aa3ce4c0db4a7
commit 4d87cf4cd1673a5464c37e56b94aa3ce4c0db4a7
Author: Ken Hornstein <address@hidden>
Date: Wed Feb 29 08:51:27 2012 -0500
Argh, I didn't mean to commit the distcomps I was using for testing!
diff --git a/etc/distcomps b/etc/distcomps
index 6aaeba5..18408e6 100644
--- a/etc/distcomps
+++ b/etc/distcomps
@@ -11,6 +11,6 @@
%; if you wish to use them.
%;
%<{nmh-from}%|%(void(localmbox))%>%(void(width))%(putaddr Resent-From: )
-%<{nmh-to}%(void(width))%(putaddr Resent-To: )%|Resent-To: %(msg) %{subject}%>
+%<{nmh-to}%(void(width))%(putaddr Resent-To: )%|Resent-To:%>
%<{nmh-cc}%(void(width))%(putaddr Resent-cc: )%|Resent-cc:%>
%<{nmh-fcc}%(void(width))%(putaddr Resent-fcc: )%|Resent-fcc:%>
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=c8f2ee90aba3d5db2cbf170b3c2f7e4ea1d84aeb
commit c8f2ee90aba3d5db2cbf170b3c2f7e4ea1d84aeb
Author: Ken Hornstein <address@hidden>
Date: Tue Feb 28 15:38:56 2012 -0500
dist(1) now processes drafts using mh-format! The last of the programs
to do so!
diff --git a/Makefile.am b/Makefile.am
index aa775f7..2b2cc63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -221,7 +221,8 @@ uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c
uip/whatnowsbr.c uip/sendsbr.c \
uip_comp_LDADD = $(LDADD) $(ICONVLIB)
uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c
\
- uip/annosbr.c uip/distsbr.c
+ uip/annosbr.c uip/distsbr.c uip/forwsbr.c
+uip_dist_LDADD = $(LDADD) $(ICONVLIB)
uip_flist_SOURCES = uip/flist.c
@@ -497,12 +498,6 @@ man/man.sed: Makefile
@echo 's,%manext1%,$(manext1),g' >> $@
@echo 's,%manext5%,$(manext5),g' >> $@
@echo 's,%manext8%,$(manext8),g' >> $@
- @echo '/%components%/r $(top_srcdir)/etc/components' >> $@
- @echo ' s,%components%,,g' >> $@
- @echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
- @echo ' s,%distcomps%,,g' >> $@
- @echo '/%forwcomps%/r $(top_srcdir)/etc/forwcomps' >> $@
- @echo ' s,%forwcomps%,,g' >> $@
@echo '/%mhl_forward%/r $(top_srcdir)/etc/mhl.forward' >> $@
@echo ' s,%mhl_forward%,,g' >> $@
@echo '/%mhl_format%/r $(top_srcdir)/etc/mhl.format' >> $@
diff --git a/etc/distcomps b/etc/distcomps
index d30819a..6aaeba5 100644
--- a/etc/distcomps
+++ b/etc/distcomps
@@ -1,3 +1,16 @@
-Resent-To:
-Resent-cc:
-Resent-fcc:
+%;
+%; distcomps - Our components file for "dist"
+%;
+%; This is modeled after the components file for forw, so check that
+%; file for more explanation as to what is going on here.
+%;
+%; When using "dist" we have to use the special Resent- headers, since
+%; we're keeping the original headers of the message intact.
+%;
+%; All of the header components from the original message are available
+%; if you wish to use them.
+%;
+%<{nmh-from}%|%(void(localmbox))%>%(void(width))%(putaddr Resent-From: )
+%<{nmh-to}%(void(width))%(putaddr Resent-To: )%|Resent-To: %(msg) %{subject}%>
+%<{nmh-cc}%(void(width))%(putaddr Resent-cc: )%|Resent-cc:%>
+%<{nmh-fcc}%(void(width))%(putaddr Resent-fcc: )%|Resent-fcc:%>
diff --git a/man/dist.man b/man/dist.man
index ae7be11..cbb8bda 100644
--- a/man/dist.man
+++ b/man/dist.man
@@ -22,6 +22,16 @@ dist \- redistribute a message to additional addresses
.RB [ \-editor
.IR editor ]
.RB [ \-noedit ]
+.RB [ \-width
+.IR columns ]
+.RB [ \-from
+.IR address ]
+.RB [ \-to
+.IR address ]
+.RB [ \-cc
+.IR address ]
+.RB [ \-fcc
+.IR +folder ]
.RB [ \-whatnowproc
.IR program ]
.RB [ \-nowhatnowproc ]
@@ -40,7 +50,10 @@ The default message form contains the following elements:
.PP
.RS 5
.nf
-%distcomps%
+Resent-From: {from switch} or <Local-Mailbox> or <address@hidden>
+Resent-To: {to switch} or blank
+Resent-cc: {cc switch} or blank
+Resent-fcc: {fcc switch} or blank
.fi
.RE
.PP
@@ -51,7 +64,39 @@ will be used instead of this default form. You may specify
an alternate
forms file with the switch
.B \-form
.IR formfile .
-The form used will be prepended to the message being resent.
+Forms are processed via the
+.B nmh
+template system; see
+.BR mh\-format (5)
+for details. Components from the redistributed message are available
+as standard component escapes in the forms file.
+.PP
+In addition to the standard
+.BR mh\-format (5)
+escapes, the following
+.I component
+escapes are also supported:
+.PP
+.RS 5
+.nf
+.ta \w'Escape 'u +\w'Returns 'u
+.I Escape Returns Description
+fcc string Any folders specified with `\-fcc\ folder'
+nmh\-from string Addresses specified with `\-from\ address'
+nmh\-to string Addresses specified with `\-to\ address'
+nmh\-cc string Addresses specified with `\-cc\ address'
+.fi
+.RE
+.PP
+See the
+.BR forw (1)
+man page for descriptions of the
+.BR \-from ,
+.BR \-to ,
+.BR \-cc ,
+and
+.B \-fcc
+switches.
.PP
If the draft already exists,
.B dist
diff --git a/uip/dist.c b/uip/dist.c
index 4bad51a..807eb78 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -42,6 +42,16 @@ static struct swit switches[] = {
{ "help", 0 },
#define FILESW 14
{ "file file", -4 }, /* interface from msh */
+#define FROMSW 15
+ { "from address", 0 },
+#define TOSW 16
+ { "to address", 0 },
+#define CCSW 17
+ { "cc address", 0 },
+#define FCCSW 18
+ { "fcc mailbox", 0 },
+#define WIDTHSW 19
+ { "width columns", 0 },
{ NULL, 0 }
};
@@ -74,9 +84,12 @@ main (int argc, char **argv)
{
int anot = 0, inplace = 1, nedit = 0;
int nwhat = 0, i, in, isdf = 0, out;
+ int outputlinelen = OUTPUTLINELEN;
+ int dat[5];
char *cp, *cwd, *maildir, *msgnam, *dfolder = NULL;
char *dmsg = NULL, *ed = NULL, *file = NULL, *folder = NULL;
char *form = NULL, *msg = NULL, buf[BUFSIZ], drft[BUFSIZ];
+ char *from = NULL, *to = NULL, *cc = NULL, *fcc = NULL;
char **argp, **arguments;
struct msgs *mp = NULL;
struct stat st;
@@ -172,6 +185,34 @@ main (int argc, char **argv)
dfolder = NULL;
isdf = NOTOK;
continue;
+
+ case FROMSW:
+ if (!(cp = *argp++) || *cp == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+ from = addlist(from, cp);
+ continue;
+ case TOSW:
+ if (!(cp = *argp++) || *cp == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+ to = addlist(to, cp);
+ continue;
+ case CCSW:
+ if (!(cp = *argp++) || *cp == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+ cc = addlist(cc, cp);
+ continue;
+ case FCCSW:
+ if (!(cp = *argp++) || *cp == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+ fcc = addlist(fcc, cp);
+ continue;
+
+ case WIDTHSW:
+ if (!(cp = *argp++) || *cp == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+ if ((outputlinelen = atoi(cp)) < 10)
+ adios (NULL, "impossible width %d", outputlinelen);
+ continue;
}
}
if (*cp == '+' || *cp == '@') {
@@ -194,8 +235,6 @@ main (int argc, char **argv)
if (file && (msg || folder))
adios (NULL, "can't mix files and folders/msgs");
- in = open_form(&form, distcomps);
-
try_it_again:
strncpy (drft, m_draft (dfolder, dmsg, NOUSE, &isdf), sizeof(drft));
@@ -226,12 +265,6 @@ try_it_again:
}
}
}
- if ((out = creat (drft, m_gmprot ())) == NOTOK)
- adios (drft, "unable to create");
-
- cpydata (in, out, form, drft);
- close (in);
- close (out);
if (file) {
/*
@@ -269,6 +302,25 @@ try_it_again:
}
msgnam = file ? file : getcpy (m_name (mp->lowsel));
+
+ dat[0] = mp->lowsel;
+ dat[1] = 0;
+ dat[2] = 0;
+ dat[3] = outputlinelen;
+ dat[4] = 0;
+
+ if (!form)
+ form = distcomps;
+
+ in = build_form(form, NULL, dat, from, to, cc, fcc, NULL, msgnam);
+
+ if ((out = creat (drft, m_gmprot ())) == NOTOK)
+ adios (drft, "unable to create");
+
+ cpydata (in, out, form, drft);
+ close (in);
+ close (out);
+
if ((in = open (msgnam, O_RDONLY)) == NOTOK)
adios (msgnam, "unable to open message");
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=99d483daa9db000183219129893ee2fd21961aae
commit 99d483daa9db000183219129893ee2fd21961aae
Author: Ken Hornstein <address@hidden>
Date: Tue Feb 28 15:38:37 2012 -0500
Fix this man page for the New World Order.
diff --git a/man/mh-mail.man b/man/mh-mail.man
index 2f29640..69e5fe4 100644
--- a/man/mh-mail.man
+++ b/man/mh-mail.man
@@ -44,7 +44,11 @@ the header and body may be separated by a line consisting of
dashes:
.PP
.RS 5
.nf
-%components%
+From: Local Mailbox <address@hidden>
+To:
+cc:
+Fcc: +outbox
+Subject:
.fi
.RE
.PP
@@ -88,8 +92,10 @@ into the mail transport system.
.PP
.BR From :
.RS 5
-Added by
-.BR post ,
+This header is filled in by default with the system's idea of the user's local
+mailbox. This can be changed with the
+.B Local\-Mailbox
+profile entry. It
contains the address of the author or authors
(may be more than one if a \*(lqSender:\*(rq field is present). For a
standard reply (using
@@ -97,6 +103,11 @@ standard reply (using
the reply address is constructed by
checking the following headers (in this order): \*(lqMail-Reply\-To:\*(rq,
\*(lqReply\-To:\*(rq, \*(lqFrom:\*(rq, \*(lqSender:\*(rq.
+A
+.BR From :
+header MUST exist when the message is sent to
+.BR post,
+otherwise the message will be rejected.
.RE
.PP
.BR Mail\-Reply\-To :
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=7efaea5e53d58f4d8c5b5217ecc4974b62a62eea
commit 7efaea5e53d58f4d8c5b5217ecc4974b62a62eea
Author: Ken Hornstein <address@hidden>
Date: Tue Feb 28 15:29:56 2012 -0500
Improve these man pages a bit.
diff --git a/man/comp.man b/man/comp.man
index 26bdaa0..0fddc26 100644
--- a/man/comp.man
+++ b/man/comp.man
@@ -163,6 +163,10 @@ profile entry or a system default email address. This
default can be
overridden by using the
.B \-from
.I address
+switch. The default mailbox in the \*(lqFcc:\*(rq field is
+.IR \+outbox .
+This can be overridden by the
+.B \-fcc
switch.
.PP
Any text you give to the
diff --git a/man/forw.man b/man/forw.man
index d4edc2f..e6fa01a 100644
--- a/man/forw.man
+++ b/man/forw.man
@@ -120,6 +120,32 @@ nmh\-subject string Any text specified with
`\-subject\ text'
.fi
.RE
.PP
+By default the \*(lqTo:\*(rq and \*(lqcc:\*(rq fields are empty. You may
+add addresses to these fields with the
+.B \-to
+.I address
+and
+.B \-cc
+.I address
+switches. You may give these switches multiple times to add multiple
+addresses.
+.PP
+By default the \*(lqFrom:\*(rq field has either the value of the
+.B Local\-Mailbox
+profile entry a system default email address. This default can be overridden
+by using the
+.B \-from
+.I address
+switch. The default mailbox in the \*(lqFcc:\*(rq field is
+.IR \+outbox .
+This can be overridden by the
+.B \-fcc
+switch.
+.PP
+Any text you give to the
+.B \-subject
+switch will be placed in the \*(lqSubject:\*(rq field in the draft.
+.PP
If the draft already exists,
.B forw
will ask you as to the disposition
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=f5cbbbb68314176516f689cabf693ed49792d900
commit f5cbbbb68314176516f689cabf693ed49792d900
Author: Ken Hornstein <address@hidden>
Date: Tue Feb 28 14:45:03 2012 -0500
Add support for %(msg) function working when not using -digest. I can't
imagine what someone would use it for but it's cheap to do, so why not?
diff --git a/uip/forw.c b/uip/forw.c
index 2d56e6b..4541c10 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -441,7 +441,7 @@ try_it_again:
form = forwcomps;
}
- dat[0] = issue;
+ dat[0] = digest ? issue : msgnum;
dat[1] = volume;
dat[2] = 0;
dat[3] = outputlinelen;
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=df6971a59e8d01dcfe605bbac949b7d4b3ab0a92
commit df6971a59e8d01dcfe605bbac949b7d4b3ab0a92
Author: Ken Hornstein <address@hidden>
Date: Tue Feb 28 10:32:41 2012 -0500
Part of the patch from bug #4301; clean up our prototypes, a lot. Still
plenty of work to do!
diff --git a/h/prototypes.h b/h/prototypes.h
index ad9a87e..935c593 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -59,7 +59,7 @@ int gans (char *, struct swit *);
char **getans (char *, struct swit *);
int getanswer (char *);
char **getarguments (char *, int, char **, int);
-char *get_charset();
+char *get_charset(void);
char *getcpy (char *);
char *getfolder(int);
int lkclose(int, char*);
@@ -143,12 +143,23 @@ char *OfficialName(char *);
int annotate (char *, char *, char *, int, int, int, int);
void annolist(char *, char *, char *, int);
void annopreserve(int);
+void clear_screen(void);
+void m_pclose(void);
+int make_intermediates(char *);
+int mhl(int, char **);
+int mhlsbr(int, char **, FILE *(*)(char *));
int distout (char *, char *, char *);
void replout (FILE *, char *, char *, struct msgs *, int,
int, char *, char *, char *);
+void set_endian(void);
+int sc_hardcopy(void);
+int sc_length(void);
+int sc_width(void);
int build_form (char *, char *, int *, char *, char *, char *, char *,
char *, char *);
int sendsbr (char **, int, char *, struct stat *, int, char *, int);
+int SOprintf (char *, ...);
int what_now (char *, int, int, char *, char *,
int, struct msgs *, char *, int, char *);
-
+int WhatNow(int, char **);
+int writeBase64aux(FILE *, FILE *);
diff --git a/uip/ap.c b/uip/ap.c
index a0f7f77..b0934fb 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -42,11 +42,6 @@ static struct format *fmt;
static int dat[5];
/*
- * prototypes
- */
-int sc_width (void); /* from termsbr.c */
-
-/*
* static prototypes
*/
static int process (char *, int, int);
diff --git a/uip/dp.c b/uip/dp.c
index c94c8ea..4e9c5cb 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -37,11 +37,6 @@ static struct format *fmt;
static int dat[5];
/*
- * prototypes
- */
-int sc_width (void); /* from termsbr.c */
-
-/*
* static prototypes
*/
static int process (char *, int);
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index d7a3cf0..ad674f4 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -103,9 +103,6 @@ int output_message_fp (CT, FILE *, char*);
/* mhlistsbr.c */
int list_all_messages (CT *, int, int, int, int);
-/* mhmisc.c */
-void set_endian (void);
-
/* mhfree.c */
void free_content (CT);
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index c349bf8..e791713 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -59,7 +59,6 @@ static char prefix[] = "----- =_aaaaaaaaaa";
/* mhmisc.c */
-int make_intermediates (char *);
void content_error (char *, CT, char *, ...);
/* mhcachesbr.c */
diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index eee8631..2c18865 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -41,13 +41,9 @@ char *cache_public;
char *cache_private;
-/* mhparse.c (OR) mhbuildsbr.c */
-int pidcheck (int);
-
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-int make_intermediates (char *);
void content_error (char *, CT, char *, ...);
void flush_errors (void);
diff --git a/uip/mhl.c b/uip/mhl.c
index de12dde..490813d 100644
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -9,9 +9,6 @@
#include <h/mh.h>
-/* prototype from mhlsbr.c */
-int mhl (int, char **);
-
int
main (int argc, char **argv)
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 664be9f..312705a 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -94,7 +94,6 @@ CT parse_mime (char *);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-void set_endian (void);
void flush_errors (void);
/* mhlistsbr.c */
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 68cb7f9..e961b9b 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -290,16 +290,6 @@ static void mhldone (int);
static void m_popen (char *);
static void filterbody (struct mcomp *, char *, int, int, FILE *);
-int mhl (int, char **);
-int mhlsbr (int, char **, FILE *(*)());
-void m_pclose (void);
-
-void clear_screen (void); /* from termsbr.c */
-int SOprintf (char *, ...); /* from termsbr.c */
-int sc_width (void); /* from termsbr.c */
-int sc_length (void); /* from termsbr.c */
-int sc_hardcopy (void); /* from termsbr.c */
-
int
mhl (int argc, char **argv)
diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 7a23139..e8a30ac 100644
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -34,8 +34,6 @@ static char *errs = NULL;
*/
int part_ok (CT, int);
int type_ok (CT, int);
-void set_endian (void);
-int make_intermediates (char *);
void content_error (char *, CT, char *, ...);
void flush_errors (void);
diff --git a/uip/mhn.c b/uip/mhn.c
index 6a46ca5..3d8801e 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -173,7 +173,6 @@ CT parse_mime (char *);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-void set_endian (void);
void flush_errors (void);
/* mhshowsbr.c */
diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 72e7bd4..8324991 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -65,7 +65,6 @@ static char nib2b64[0x40+1] =
*/
int output_message (CT, char *);
int output_message_fp (CT, FILE *, char *);
-int writeBase64aux (FILE *, FILE *);
/*
* static prototypes
diff --git a/uip/mhparse.c b/uip/mhparse.c
index 5b48483..e9a4cee 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -85,16 +85,12 @@ struct k2v SubApplication[] = {
};
-/* ftpsbr.c */
-int ftp_get (char *, char *, char *, char *, char *, char *, int, int);
-
/* mhcachesbr.c */
int find_cache (CT, int, int *, char *, char *, int);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-int make_intermediates (char *);
void content_error (char *, CT, char *, ...);
/* mhfree.c */
diff --git a/uip/mhshow.c b/uip/mhshow.c
index ea34914..eb9c412 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -110,7 +110,6 @@ CT parse_mime (char *);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-void set_endian (void);
void flush_errors (void);
/* mhshowsbr.c */
diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 5abd67d..6bfc0bc 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -38,12 +38,6 @@ pid_t xpid = 0;
static sigjmp_buf intrenv;
-/* termsbr.c */
-int SOprintf (char *, ...);
-
-/* mhparse.c */
-int pidcheck (int);
-
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
diff --git a/uip/mhstore.c b/uip/mhstore.c
index 2646ba6..7814dd2 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -88,7 +88,6 @@ CT parse_mime (char *);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-void set_endian (void);
void flush_errors (void);
/* mhstoresbr.c */
diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 5962184..58ed5be 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -48,7 +48,6 @@ typedef int (*qsort_comp) (const void *, const void *);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-int make_intermediates (char *);
void flush_errors (void);
/* mhshowsbr.c */
diff --git a/uip/mhtest.c b/uip/mhtest.c
index cde45db..e5c4545 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -93,7 +93,6 @@ int output_message (CT, char *);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-void set_endian (void);
void flush_errors (void);
/* mhfree.c */
diff --git a/uip/msh.c b/uip/msh.c
index 43530db..f6d1a36 100644
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -153,8 +153,6 @@ int told_to_quit; /* SIGQUIT detected */
/*
* prototypes
*/
-int SOprintf (char *, ...); /* from termsbr.c */
-int sc_width (void); /* from termsbr.c */
void fsetup (char *);
void setup (char *);
FILE *msh_ready (int, int);
diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index 19d8b5b..9937a1d 100644
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -33,13 +33,6 @@ static FILE *mhlfp;
typedef int (*qsort_comp) (const void *, const void *);
/*
- * prototypes
- */
-void clear_screen (void); /* from termsbr.c */
-int SOprintf (char *, ...); /* from termsbr.c */
-int sc_width (void); /* from termsbr.c */
-
-/*
* static prototypes
*/
static int burst (struct Msg *, int, int, int, int);
@@ -58,9 +51,6 @@ static int process (int, char *, int, char **);
static void copy_message (int, FILE *);
static void copy_digest (int, FILE *);
-/* from mhlsbr.c */
-int mhlsbr (int, char **, FILE *(*)());
-
void
forkcmd (char **args, char *pgm)
{
diff --git a/uip/scansbr.c b/uip/scansbr.c
index ae347e8..835a884 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -56,7 +56,6 @@ char *scanl = 0; /* text of most recent
scanline */
/*
* prototypes
*/
-int sc_width (void); /* from termsbr.c */
static int mh_fputs(char *, FILE *);
#ifdef MULTIBYTE_SUPPORT
diff --git a/uip/show.c b/uip/show.c
index a59e10c..1b11871 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -52,9 +52,6 @@ static struct swit switches[] = {
*/
static int is_nontext(char *);
-/* prototype from mhlsbr.c */
-int mhl (int, char **);
-
#define SHOW 0
#define NEXT 1
#define PREV 2
diff --git a/uip/viamail.c b/uip/viamail.c
index 49bbdf4..12412c7 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -52,12 +52,6 @@ extern int verbsw;
int ebcdicsw = 0; /* hack for linking purposes */
-/* mhmisc.c */
-void set_endian (void);
-
-/* mhoutsbr.c */
-int writeBase64aux (FILE *, FILE *);
-
/*
* static prototypes
*/
diff --git a/uip/whatnow.c b/uip/whatnow.c
index d3fccfd..be50bc9 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -9,9 +9,6 @@
#include <h/mh.h>
-/* from whatnowsbr.c */
-int WhatNow (int, char **);
-
int
main (int argc, char **argv)
diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index 6bf4b36..293d5ce 100644
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -19,9 +19,6 @@
* it will call this routine directly without exec'ing it.
*/
-/* from whatnowsbr.c */
-int WhatNow (int, char **);
-
int
what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 9 +-----
etc/distcomps | 19 ++++++++++++--
h/prototypes.h | 15 ++++++++++-
man/comp.man | 4 +++
man/dist.man | 49 ++++++++++++++++++++++++++++++++++++-
man/forw.man | 26 ++++++++++++++++++++
man/mh-mail.man | 17 +++++++++++--
uip/ap.c | 5 ----
uip/dist.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++------
uip/dp.c | 5 ----
uip/forw.c | 2 +-
uip/mhbuild.c | 3 --
uip/mhbuildsbr.c | 1 -
uip/mhcachesbr.c | 4 ---
uip/mhl.c | 3 --
uip/mhlist.c | 1 -
uip/mhlsbr.c | 10 -------
uip/mhmisc.c | 2 -
uip/mhn.c | 1 -
uip/mhoutsbr.c | 1 -
uip/mhparse.c | 4 ---
uip/mhshow.c | 1 -
uip/mhshowsbr.c | 6 ----
uip/mhstore.c | 1 -
uip/mhstoresbr.c | 1 -
uip/mhtest.c | 1 -
uip/msh.c | 2 -
uip/mshcmds.c | 10 -------
uip/scansbr.c | 1 -
uip/show.c | 3 --
uip/viamail.c | 6 ----
uip/whatnow.c | 3 --
uip/whatnowproc.c | 3 --
33 files changed, 183 insertions(+), 104 deletions(-)
hooks/post-receive
--
The nmh Mail Handling System
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. a80e3521e108c8c625c40595453e235e43d84800,
Ken Hornstein <=