From: Ruud de Rooij Date: Thu, 6 Jan 2000 21:30:07 +0000 (+0000) Subject: * Move mhtest from bindir to libdir. X-Git-Tag: nmh-1_0~121 X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=264318e5898da32e9a0e3ec2b4c69185db89bb8a * Move mhtest from bindir to libdir. * Move sendfiles from libdir to bindir. * Updated sendfiles manpage to reflect this change. * Added documentation for -build and -file switches to repl and forw manpages (patch from Peter Maydell). * Fixed interaction between specifying -cc in profile and -group on command-line. --- diff --git a/ChangeLog b/ChangeLog index 84dfb76..61e91a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Sun Jan 2 23:42:18 2000 Ruud de Rooij + + * Move mhtest from bindir to libdir. + + * Move sendfiles from libdir to bindir. + + * Updated sendfiles manpage to reflect this change. + + * Added documentation for -build and -file switches to repl and + forw manpages (patch from Peter Maydell). + + * Fixed interaction between specifying -cc in profile and -group on + command-line. + Tue Nov 1 13:48:10 1999 Dan Harkless * Changed the version number from 1.0.3 to 1.0.2+dev. There was diff --git a/etc/Makefile.in b/etc/Makefile.in index e58951e..b45ef86 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -87,9 +87,9 @@ install-files: done install-scripts: - $(top_srcdir)/mkinstalldirs $(libdir) + $(top_srcdir)/mkinstalldirs $(bindir) for script in $(SCRIPTS); do \ - $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \ + $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \ done uninstall: uninstall-files uninstall-scripts @@ -101,7 +101,7 @@ uninstall-files: uninstall-scripts: for script in $(SCRIPTS); do \ - rm -f $(libdir)/$$script; \ + rm -f $(bindir)/$$script; \ done # ========== DEPENDENCIES FOR CLEANUP ========== diff --git a/man/forw.man b/man/forw.man index 7d95613..6dab969 100644 --- a/man/forw.man +++ b/man/forw.man @@ -31,6 +31,10 @@ forw \%[\-whatnowproc\ program] \%[\-nowhatnowproc] .br \%[\-dashstuffing] \%[\-nodashstuffing] +.br +\%[\-build] +\%[\-file msgfile] +.br \%[\-version] \%[\-help] @@ -161,6 +165,25 @@ options. The invocation of this program can be inhibited by using the program which starts the initial edit. Hence, `\-nowhatnowproc' will prevent any edit from occurring.) +The `\-build' switch is intended to be used by the Emacs mh-e interface +to \fInmh\fR, and is only present if \fInmh\fR was compiled with support +for mh-e. It implies `\-nowhatnowproc'. It causes a file /draft +to be created, containing the draft message that would normally be presented +to the user for editing. +No mail is actually sent. Note that this switch is not guaranteed to +be present or to have the same effects in future versions of \fInmh\fR: +it is documented here only for completeness. + +The `\-file\ msgfile' switch specifies the message to be forwarded as an +exact filename rather than as an \fInmh\fR folder and message number. It is +intended to be used by the \fImsh\fR\0(1) interface to \fInmh\fR. +This switch implies `-noannotate'. The forwarded message is simply +copied verbatim into the draft; the processing implied by +the `-filter', `-mime' and `-digest' switches is bypassed, and the +usual leading and trailing 'Forwarded Message' delimiters are not +added. +The same caveats apply to this option as to the `\-build' switch. + The `\-digest\ list', `\-issue\ number', and `\-volume\ number' switches implement a digest facility for \fInmh\fR. Specifying these switches enables and/or overloads the following escapes: diff --git a/man/repl.man b/man/repl.man index f767db7..2ffa7ac 100644 --- a/man/repl.man +++ b/man/repl.man @@ -38,6 +38,9 @@ repl .br \%[\-whatnowproc\ program] \%[\-nowhatnowproc] .br +\%[\-build] +\%[-file msgfile] +.br \%[\-version] \%[\-help] .in -.5i @@ -271,6 +274,20 @@ options. The invocation of this program can be inhibited by using the program which starts the initial edit. Hence, `\-nowhatnowproc' will prevent any edit from occurring.) +The `\-build' switch is intended to be used by the Emacs mh-e interface +to \fInmh\fR, and is only present if \fInmh\fR was compiled with support +for mh-e. It implies `\-nowhatnowproc'. It causes a file /reply +to be created, containing the draft message that would normally be presented +to the user for editing. +No mail is actually sent. Note that this switch is not guaranteed to +be present or to have the same effects in future versions of \fInmh\fR: +it is documented here only for completeness. + +The `\-file\ msgfile' switch specifies the message to be replied to as an +exact filename rather than as an \fInmh\fR folder and message number. It is +intended to be used by the \fImsh\fR\0(1) interface to \fInmh\fR. +The same caveats apply to this option as to the `\-build' switch. + .Fi ^%etcdir%/replcomps~^The standard reply template ^or /replcomps~^Rather than the standard template diff --git a/man/sendfiles.man b/man/sendfiles.man index 72f843c..7d00a71 100644 --- a/man/sendfiles.man +++ b/man/sendfiles.man @@ -19,7 +19,7 @@ The shell script \fIsendfiles\fR, is used to send a collection of files and directories via electronic mail. .sp .in +.5i -%libdir%/sendfiles mailpath \*(lqsubject\*(rq files\0... +sendfiles mailpath \*(lqsubject\*(rq files\0... .in -.5i .sp \fIsendfiles\fR will archive the files and directories you name @@ -37,7 +37,7 @@ interpreted as the number of seconds to pause in between postings, e.g., .sp .in +.5i -%libdir%/sendfiles -30 mailpath \*(lqsubject\*(rq files\0... +sendfiles -30 mailpath \*(lqsubject\*(rq files\0... .in -.5i .sp will pause 30 seconds in between each posting. diff --git a/uip/Makefile.in b/uip/Makefile.in index 364b359..f8e36c9 100644 --- a/uip/Makefile.in +++ b/uip/Makefile.in @@ -52,7 +52,7 @@ SETGID_MAIL = @SETGID_MAIL@ # commands to build CMDS = ali anno burst comp dist flist folder forw mark mhbuild \ - mhlist mhmail mhn mhparam mhpath mhshow mhstore mhtest msgchk \ + mhlist mhmail mhn mhparam mhpath mhshow mhstore msgchk \ msh packf pick prompter refile repl rmf rmm scan send show \ sortm viamail whatnow whom @@ -64,7 +64,7 @@ LCMDS = flists folders next prev # misc support binaries MISC = ap conflict dp fmtdump install-mh mhl post rcvdist rcvpack \ - rcvstore rcvtty slocal spost + rcvstore rcvtty slocal spost mhtest # commands with 'S'pecial installation needs SCMDS = inc diff --git a/uip/forw.c b/uip/forw.c index 8455431..cff49c7 100644 --- a/uip/forw.c +++ b/uip/forw.c @@ -64,11 +64,11 @@ static struct swit switches[] = { #define HELPSW 23 { "help", 4 }, #define FILESW 24 - { "file file", -4 }, /* interface from msh */ + { "file file", 4 }, /* interface from msh */ #ifdef MHE #define BILDSW 25 - { "build", -5 }, /* interface from mhe */ + { "build", 5 }, /* interface from mhe */ #endif /* MHE */ { NULL, 0 } diff --git a/uip/repl.c b/uip/repl.c index d7c09ac..d3a8d07 100644 --- a/uip/repl.c +++ b/uip/repl.c @@ -64,11 +64,11 @@ static struct swit switches[] = { #define HELPSW 26 { "help", 4 }, #define FILESW 27 - { "file file", -4 }, /* interface from msh */ + { "file file", 4 }, /* interface from msh */ #ifdef MHE #define BILDSW 28 - { "build", -5 }, /* interface from mhe */ + { "build", 5 }, /* interface from mhe */ #endif { NULL, 0 } @@ -108,9 +108,9 @@ static struct swit aqrl[] = { { NULL, 0 } }; -short ccto = 0; /* global for replsbr */ -short cccc = 0; -short ccme = 0; +short ccto = -1; /* global for replsbr */ +short cccc = -1; +short ccme = -1; short querysw = 0; short outputlinelen = OUTPUTLINELEN; @@ -177,11 +177,9 @@ main (int argc, char **argv) case GROUPSW: groupreply++; - ccto = cccc = ccme = 1; continue; case NGROUPSW: groupreply = 0; - ccto = cccc = ccme = 0; continue; case ANNOSW: @@ -325,6 +323,13 @@ main (int argc, char **argv) } } + if (ccto == -1) + ccto = groupreply; + if (cccc == -1) + cccc = groupreply; + if (ccme == -1) + ccme = groupreply; + cwd = getcpy (pwd ()); if (!context_find ("path"))