From 5ee5d678d59cf1deea31126bc886333f1be4571d Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Thu, 22 Mar 2012 13:09:14 +0100 Subject: [PATCH] Defined show(mime)proc locally and removed their profile entries. Their paths are relative now, too. --- config/config.c | 14 -------------- h/mh.h | 2 -- man/mh-profile.man5 | 16 ---------------- man/next.man1 | 4 +--- man/prev.man1 | 4 +--- man/show.man1 | 31 +++++++++---------------------- sbr/readconfig.c | 2 -- uip/mhparam.c | 2 -- uip/show.c | 2 ++ 9 files changed, 13 insertions(+), 64 deletions(-) diff --git a/config/config.c b/config/config.c index fa0b0fc..e650b0d 100644 --- a/config/config.c +++ b/config/config.c @@ -164,20 +164,6 @@ char *rmmproc = NULL; char *sendproc = NMHBINDIR"/send"; /* -** This is the path to the program used by "show" -** to display non-text (MIME) messages. -*/ -char *showmimeproc = NMHBINDIR"/mhshow"; - -/* -** This is the default program called by "show" to filter -** and display standard text (non-MIME) messages. It can be -** changed to a pager (such as "more" or "less") if you prefer -** that such message not be filtered in any way. -*/ -char *showproc = NMHBINDIR"/mhl"; - -/* ** This is the program (mhl) used to filter messages. It is ** used by mhshow to filter and display the message headers of ** MIME messages. It is used by repl (with -filter) diff --git a/h/mh.h b/h/mh.h index dd049d3..44363b6 100644 --- a/h/mh.h +++ b/h/mh.h @@ -335,8 +335,6 @@ extern char *seq_next; extern char *seq_prev; extern char *seq_unseen; extern char *seq_neg; -extern char *showmimeproc; -extern char *showproc; extern char *usequence; extern char *version_num; extern char *version_str; diff --git a/man/mh-profile.man5 b/man/mh-profile.man5 index 3f38e10..d3e6e31 100644 --- a/man/mh-profile.man5 +++ b/man/mh-profile.man5 @@ -492,22 +492,6 @@ This is the program to use by to actually send the message .RE .PP -.BR showmimeproc : -%bindir%/mhshow -.RS 5 -This is the program used by -.B show -to process and display non-text (MIME) messages. -.RE -.PP -.BR showproc : -%bindir%/mhl -.RS 5 -This is the program used by -.B show -to filter and display text (non-MIME) messages. -.RE -.PP .BR whatnowproc : %bindir%/whatnow .RS 5 diff --git a/man/next.man1 b/man/next.man1 index c32689a..2b44d9f 100644 --- a/man/next.man1 +++ b/man/next.man1 @@ -57,12 +57,10 @@ details. .ta \w'ExtraBigProfileName 'u ^Path:~^To determine the user's mail storage ^Current\-Folder:~^To find the default current folder -^showproc:~^Program to show non-MIME messages -^showmimeproc:~^Program to show MIME messages .fi .SH "SEE ALSO" -show(1), prev(1) +show(1), prev(1), mhshow(1) .SH DEFAULTS .nf diff --git a/man/prev.man1 b/man/prev.man1 index 7cdb8e4..06464d4 100644 --- a/man/prev.man1 +++ b/man/prev.man1 @@ -55,12 +55,10 @@ for all the details. .ta \w'ExtraBigProfileName 'u ^Path:~^To determine the user's mail storage ^Current\-Folder:~^To find the default current folder -^showproc:~^Program to show non-MIME messages -^showmimeproc:~^Program to show MIME messages .fi .SH "SEE ALSO" -show(1), next(1) +show(1), next(1), mhshow(1) .SH DEFAULTS .nf diff --git a/man/show.man1 b/man/show.man1 index 47cf7d0..047baf5 100644 --- a/man/show.man1 +++ b/man/show.man1 @@ -39,14 +39,10 @@ the format of the displayed messages and which headers fields are shown. See the .BR mhl (1) manual page for the details about this -command. This default can be changed by defining the -.I showproc -profile component. Any switches not recognized by +command. Any switches not recognized by .B show are -passed along to that program. To override the default and the -.I showproc -profile component, use the +passed along to that program. To override the default, use the .B \-showproc .I program switch. For example, @@ -54,11 +50,7 @@ switch. For example, .I more will cause the .B more -program to list the messages with no reformatting. Normally, this -program is specified as the -.I showproc -in the user's profile, -rather than using a command line switch. +program to list the messages with no reformatting. .PP By default, non-text messages (MIME messages with multi-media contents) are processed and displayed by the @@ -68,15 +60,12 @@ command See the .BR mhshow (1) manual page for details -about this command. This default can changed by defining the -.I showmimeproc -profile component. Any switches not recognized +about this command. +Any switches not recognized by .B show are passed along to that program. To override this -default and the -.B showmimeproc -profile component, use the +default, use the .B \-showmimeproc .I program switch. @@ -105,10 +94,10 @@ The option .B show to test if any of the messages to be displayed are non-text (MIME) -messages. If any are non-text, they are displayed by the program +messages. If any are non-text, they are displayed by the .IR showmimeproc , -else they are displayed by the program -.IR showproc . +else they are displayed by the +.BR showproc . The option .B \-nocheckmime disables this test and instructs @@ -163,8 +152,6 @@ from each sequence named by the profile entry. ^Path:~^To determine the user's mail storage ^Current\-Folder:~^To find the default current folder ^Unseen\-Sequence:~^To name sequences denoting unseen messages -^showproc:~^Program to show text (non-MIME) messages -^showmimeproc:~^Program to show non-text (MIME) messages .fi .SH "SEE ALSO" diff --git a/sbr/readconfig.c b/sbr/readconfig.c index d418731..16659a9 100644 --- a/sbr/readconfig.c +++ b/sbr/readconfig.c @@ -30,8 +30,6 @@ static struct procstr procs[] = { { "rmmproc", &rmmproc }, { "sendmail", &sendmail }, { "sendproc", &sendproc }, - { "showmimeproc", &showmimeproc }, - { "showproc", &showproc }, { "whatnowproc", &whatnowproc }, { NULL, NULL } }; diff --git a/uip/mhparam.c b/uip/mhparam.c index 64ee5d7..4cad041 100644 --- a/uip/mhparam.c +++ b/uip/mhparam.c @@ -49,8 +49,6 @@ static struct proc procs [] = { { "rmmproc", &rmmproc }, { "sendmail", &sendmail }, { "sendproc", &sendproc }, - { "showmimeproc", &showmimeproc }, - { "showproc", &showproc }, { "version", &version_num }, { "whatnowproc", &whatnowproc }, { "etcdir", &mhetcdir }, diff --git a/uip/show.c b/uip/show.c index 2b53141..4abc3d7 100644 --- a/uip/show.c +++ b/uip/show.c @@ -43,6 +43,8 @@ static int is_nontext(char *); #define NEXT 1 #define PREV 2 +char *showproc = "mhl"; +char *showmimeproc = "mhshow"; int main(int argc, char **argv) -- 1.7.10.4