* Remove sleep of 5 seconds for mailcap programs that use the terminal

    to display content. Suggested by Carl Edquist. In addition to remove
    configurable process table command and it corresponding sleep time.

5 files changed, 5 insertions, 75 deletions

diff --git a/pith/conf.c b/pith/conf.c
index dedeb1be..a3f50b39 100644
--- a/pith/conf.c
+++ b/pith/conf.c
@@ -349,8 +349,6 @@ CONF_TXT_T cf_text_stat_msg_delay[] =	"The number of seconds to sleep after writ
 
 CONF_TXT_T cf_text_busy_cue_rate[] =	"Number of times per-second to update busy cue messages";
 
-CONF_TXT_T cf_text_psleep[] =	"UNIX ONLY (except MAC OSX): When an attachment is opened, this variable controls the number\n#of seconds to wait between checks if the user has ended viewing the attachment.\n#minimum value: 60 seconds, maximum value: 600 seconds (10 minutes). Default: 60 seconds";
-
 CONF_TXT_T cf_text_mailcheck[] =	"The approximate number of seconds between checks for new mail";
 
 CONF_TXT_T cf_text_mailchecknoncurr[] =	"The approximate number of seconds between checks for new mail in folders\n# other than the current folder and inbox.\n# Default is same as mail-check-interval";
@@ -639,8 +637,6 @@ static struct variable variables[] = {
 	NULL,			cf_text_stat_msg_delay},
 {"busy-cue-rate",			0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
 	NULL,			cf_text_busy_cue_rate},
-{"mailcap-check-interval",		0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
-	NULL,			cf_text_psleep},
 {"mail-check-interval",			0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
 	NULL,			cf_text_mailcheck},
 {"mail-check-interval-noncurrent",	0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
@@ -1659,7 +1655,6 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **))
     GLO_LOCAL_FULLNAME		= cpystr(DF_LOCAL_FULLNAME);
     GLO_LOCAL_ADDRESS		= cpystr(DF_LOCAL_ADDRESS);
     GLO_OVERLAP			= cpystr(DF_OVERLAP);
-    GLO_SLEEP			= cpystr("60");
     GLO_MAXREMSTREAM		= cpystr(DF_MAXREMSTREAM);
     GLO_MARGIN			= cpystr(DF_MARGIN);
     GLO_FILLCOL			= cpystr(DF_FILLCOL);
@@ -2141,13 +2136,6 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **))
 	}
     }
 
-    set_current_val(&vars[V_SLEEP], TRUE, TRUE);
-    ps->sleep = i = 60;
-    if(SVAR_SLEEP(ps, i, tmp_20k_buf, SIZEOF_20KBUF))
-      init_error(ps, SM_ORDER | SM_DING, 3, 5, tmp_20k_buf);
-    else
-      ps->sleep = i;
-
     set_current_val(&vars[V_OVERLAP], TRUE, TRUE);
     ps->viewer_overlap = i = atoi(DF_OVERLAP);
     if(SVAR_OVERLAP(ps, i, tmp_20k_buf, SIZEOF_20KBUF))
@@ -7835,8 +7823,6 @@ config_help(int var, int feature)
 	return(h_config_incoming_second_interv);
       case V_INCCHECKLIST :
 	return(h_config_incoming_list);
-      case V_SLEEP :
-	return(h_config_psleep);
       case V_OVERLAP :
 	return(h_config_viewer_overlap);
       case V_MAXREMSTREAM :
diff --git a/pith/conf.h b/pith/conf.h
index 1ed1f90b..949e87f6 100644
--- a/pith/conf.h
+++ b/pith/conf.h
@@ -239,8 +239,6 @@
 #define GLO_OPENING_SEP		     vars[V_OPENING_SEP].global_val.p
 #define VAR_ABOOK_FORMATS	     vars[V_ABOOK_FORMATS].current_val.l
 #define VAR_INDEX_FORMAT	     vars[V_INDEX_FORMAT].current_val.p
-#define VAR_SLEEP		     vars[V_SLEEP].current_val.p
-#define GLO_SLEEP		     vars[V_SLEEP].global_val.p
 #define VAR_OVERLAP		     vars[V_OVERLAP].current_val.p
 #define GLO_OVERLAP		     vars[V_OVERLAP].global_val.p
 #define VAR_MAXREMSTREAM	     vars[V_MAXREMSTREAM].current_val.p
@@ -689,10 +687,6 @@
  */
 #define Q_SUPP_LIMIT (4)
 #define Q_DEL_ALL    (-10)
-#define	SVAR_SLEEP(ps,n,e,el)	strtoval((ps)->VAR_SLEEP,		  \
-					 &(n), 60, 120, 0, (e),		  \
-					  (el), 			  \
-					 "Sleep-Interval-Length")
 #define	SVAR_OVERLAP(ps,n,e,el)	strtoval((ps)->VAR_OVERLAP,		  \
 					 &(n), 0, 20, 0, (e),		  \
 					  (el), 			  \
diff --git a/pith/conftype.h b/pith/conftype.h
index ca316189..88f479c1 100644
--- a/pith/conftype.h
+++ b/pith/conftype.h
@@ -111,7 +111,6 @@ typedef	enum {    V_PERSONAL_NAME = 0
 		, V_MARGIN
 		, V_STATUS_MSG_DELAY
 		, V_ACTIVE_MSG_INTERVAL
-		, V_SLEEP
 		, V_MAILCHECK
 		, V_MAILCHECKNONCURR
 		, V_MAILDROPCHECK
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 1f0de5be..b23eabad 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 417 2020-04-05 01:33:49
+Alpine Commit 418 2020-04-11 22:28:50
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -196,6 +196,10 @@ problems you find with this release.
 <LI> New variable system-certs-file that allows users to configure the
      location of a container of certificate authority (CA) certificates
      to be used to validate certificates of remote servers.
+
+<LI> Remove sleep of 5 seconds for mailcap programs that use the terminal
+     to display content. Suggested by Carl Edquist. In addition to remove
+     configurable process table command and it corresponding sleep time.
 </UL>
 
 <P>
@@ -860,15 +864,6 @@ Bugs that have been addressed include:
   <LI> When writing the .pinerc file, lines were truncated if they were longer
        than 10,000 characters. This could cause data corruption, so now lines
        are allowed to be of any length.
-  <LI> In Unix Alpine (but not in MAC OSX) fix a problem that made Alpine 
-       remove attachments before they were open by a mailcap viewer. It 
-       requires that the user has an equivalent to a command such as "ps 
-       auxww" to list the list of processes, and check if there is any 
-       program using the attachment. The default is "/bin/ps auxww", but 
-       it can be changed at compile time with the option --with-ps-cmd. 
-       See the help of the variable 
-       <a href="h_config_psleep"><!--#echo var="VAR_mailcap-check-interval"--></a> 
-       for more information.
   <LI> S/MIME: signed messages that contained an attachment would not validate.
   <LI> S/MIME: signed and encrypted messages from Thunderbird would not 
        validate. Thanks to Andreas Schamanek for testing, debugging and 
@@ -4603,7 +4598,6 @@ There are also additional details on
 <li><a href="h_config_image_viewer">OPTION: <!--#echo var="VAR_image-viewer"--></a>
 <li><a href="h_config_inbox_path">OPTION: <!--#echo var="VAR_inbox-path"--></a>
 <li><a href="h_config_archived_folders">OPTION: <!--#echo var="VAR_incoming-archive-folders"--></a>
-<li><a href="h_config_psleep">OPTION: <!--#echo var="VAR_mailcap-check-interval"--></a>
 <li><a href="h_config_incoming_interv">OPTION: <!--#echo var="VAR_incoming-check-interval"--></a>
 <li><a href="h_config_incoming_second_interv">OPTION: <!--#echo var="VAR_incoming-check-interval-secondary"--></a>
 <li><a href="h_config_incoming_list">OPTION: <!--#echo var="VAR_incoming-check-list"--></a>
@@ -21848,47 +21842,6 @@ give up and consider it a failed connection.
 &lt;End of help on this topic&gt;
 </BODY>
 </HTML>
-====== h_config_psleep ======
-<HTML>
-<HEAD>
-<TITLE>OPTION: <!--#echo var="VAR_mailcap-check-interval"--> (UNIX Alpine only)</TITLE>
-</HEAD>
-<BODY>
-<H1>OPTION: <!--#echo var="VAR_mailcap-check-interval"--> (UNIX Alpine only)</H1>
-
-<P>
-In the good old days a mailcap viewer was used to examine an 
-attachment before saving it, and after viewing the attachment control 
-would return to the operating system when the viewer was closed. Therefore, 
-when the mailcap viewer returned control to the operating system, it 
-could be assumed that the user who opened the attachment was done
-examining it, and the copy of the attachment that was used, could be removed.
-
-<P>
-However, today this assumption is not longer valid. Some viewers return 
-control to the operating system before they actually read the attachment
-to be examined. This causes Alpine to delete the attachment before it 
-is read by the viewer, causing the viewer to fail opening the attachment.
-
-<P>
-In order to work around this problem, Alpine checks, after the viewer has 
-returned control to the operating system, if there is any process that is 
-using the attachment. This variable controls the number of seconds that 
-must elapse between checks. Once it is found that no process is using the 
-attachment, this is removed.
-
-<P>
-The minimum value for this variable is 60 (checks will be made once per 
-minute), and the maximum value is 600 (checks will be made once every 10 
-minutes). The default value is 60.
-
-<P>
-<UL>   
-<LI><A HREF="h_finding_help">Finding more information and requesting help</A>
-</UL><P>
-&lt;End of help on this topic&gt;
-</BODY>
-</HTML>
 ====== h_config_incoming_interv ======
 <HTML>
 <HEAD>
diff --git a/pith/state.h b/pith/state.h
index c0106b32..41ef1b43 100644
--- a/pith/state.h
+++ b/pith/state.h
@@ -320,8 +320,6 @@ struct pine {
 
     int          tcp_query_timeout;
 
-    int		 sleep;
-
     int          inc_check_timeout;
     int          inc_check_interval;		/* for local and IMAP */
     int          inc_second_check_interval;	/* for other */