[continued from previous message]

struct cancel_data *cd;
{
! enum wait_for_status ret;
! int err = 0;
char *X = schedule_timeout_string(deadline);

! DPRINT(Debug,4,(&Debug,"wait_for_action_or_deadline_c: START | deadline=%s\n",
X ? X : "n/a"));
! ret = wait_for_something(ANY_ACTION,-1,cd,NULL,deadline,NULL,&err,0);
! DPRINT(Debug,4,(&Debug,"wait_for_action_or_deadline_c=%d END (errno %d) \n",
! ret,err));

if (X)
free(X);

+ errno = err;
+ return ret;
+ }
+
+ /* Updates *resulttime */
+ enum wait_for_status wait_for_action_or_deadline_settime(action,deadline,resulttime)
+ action_routine * action;
+ const struct schedule_timelimit * deadline;
+ struct schedule_timelimit * resulttime;
+ {
+ enum wait_for_status ret;
+ int err = 0;
+ char *X = schedule_timeout_string(deadline);
+
+ DPRINT(Debug,4,(&Debug,"wait_for_action_or_deadline_settime: START | deadline=%s\n",
+ X ? X : "n/a"));
+ ret = wait_for_something(ANY_ACTION,-1,NULL,NULL,deadline,resulttime,&err,0);
+ DPRINT(Debug,4,(&Debug,"wait_for_action_or_deadline_settime=%d END (errno %d) \n",
+ ret,err));
+
+ if (X)
+ free(X);
+
+ errno = err;
+ return ret;
+
+ }
+
+ /* Updates *resulttime */
+ enum wait_for_status wait_for_action_or_deadline_settime_c(action,deadline,resulttime,cd)
+ action_routine * action;
+ const struct schedule_timelimit * deadline;
+ struct schedule_timelimit * resulttime;
+ struct cancel_data * cd;
+ {
+ enum wait_for_status ret;
+ int err = 0;
+ char *X = schedule_timeout_string(deadline);
+
+ DPRINT(Debug,4,(&Debug,"wait_for_action_or_deadline_settime_c: START | deadline=%s\n",
+ X ? X : "n/a"));
+ ret = wait_for_something(ANY_ACTION,-1,cd,NULL,deadline,resulttime,&err,0);
+ DPRINT(Debug,4,(&Debug,"wait_for_action_or_deadline_settime_c=%d END (errno %d) \n",
+ ret,err));
+
+ if (X)
+ free(X);
+
+ errno = err;
return ret;
}

Index: elmME+.2.5.alpha47-cvs/lib/service_list.c
*** elmME+.2.5.alpha46/lib/service_list.c 2017-09-13 19:32:05.000000000 +0300
--- elmME+.2.5.alpha47-cvs/lib/service_list.c 2018-01-21 19:24:37.000000000 +0200
***************
*** 1,7 ****
! static char rcsid[] = "@(#)$Id: service_list.c,v 2.43 2017/08/26 13:47:01 hurtta Exp $";

/******************************************************************************
! * The Elm (ME+) Mail System - $Revision: 2.43 $ $State: Exp $
*
* Author: Kari Hurtta <hurtta+elm@siilo.FMI.FI>
* (was hurtta+elm@posti.FMI.FI, hurtta+elm@ozone.FMI.FI) --- 1,7 ----
! static char rcsid[] = "@(#)$Id: service_list.c,v 2.47 2018/01/21 17:24:37 hurtta Exp $";

/******************************************************************************
! * The Elm (ME+) Mail System - $Revision: 2.47 $ $State: Exp $
*
* Author: Kari Hurtta <hurtta+elm@siilo.FMI.FI>
* (was hurtta+elm@posti.FMI.FI, hurtta+elm@ozone.FMI.FI) ***************
*** 18,23 ****
--- 18,24 ----
#include "s_me.h"
#include "s_elm.h"
#include "rc_imp.h"
+ #include