* mail/mailline.c: "interupt" is actually a key word

	for somce C compiler i.e. Watcomm C, rename it to "interrupted".
	* mail/util.c: The macros O_CREAT etc needs <sys/fnct.h>.

 2001-07-06  Alain Magloire
 2001-07-06  Alain Magloire
 
 
+	* mail/mailline.c: "interupt" is actually a key word
+	for somce C compiler i.e. Watcomm C, rename it to "interrupted".
+	* mail/util.c: The macros O_CREAT etc needs <sys/fnct.h>.
+
+2001-07-06  Alain Magloire
+
 	* mail/mail.c: Be a little more verbose when mailbox_{create,open}()
 	* mail/mail.c: Be a little more verbose when mailbox_{create,open}()
 	fails at startup.
 	fails at startup.
 	* doc/Makefile.am: Add the missing *.texi in the list of EXTRA_DIST.
 	* doc/Makefile.am: Add the missing *.texi in the list of EXTRA_DIST.

@@ -20,7 +20,7 @@
 static char **ml_command_completion __P((char *cmd, int start, int end));
 static char **ml_command_completion __P((char *cmd, int start, int end));
 static char *ml_command_generator __P((char *text, int state));
 static char *ml_command_generator __P((char *text, int state));
 
 
-static int _interrupt;
+static volatile int _interrupted;
 
 
 static RETSIGTYPE
 static RETSIGTYPE
 sig_handler (int signo)
 sig_handler (int signo)
@@ -30,7 +30,7 @@ sig_handler (int signo)
     case SIGINT:
     case SIGINT:
       if (util_find_env ("quit")->set)
       if (util_find_env ("quit")->set)
 	exit (0);
 	exit (0);
-      _interrupt++;
+      _interrupted++;
       break;
       break;
 #if defined (SIGWINCH)
 #if defined (SIGWINCH)
     case SIGWINCH:
     case SIGWINCH:
@@ -43,14 +43,14 @@ sig_handler (int signo)
 void
 void
 ml_clear_interrupt ()
 ml_clear_interrupt ()
 {
 {
-  _interrupt = 0;
+  _interrupted = 0;
 }
 }
 
 
 int
 int
 ml_got_interrupt ()
 ml_got_interrupt ()
 {
 {
-  int rc = _interrupt;
-  _interrupt = 0;
+  int rc = _interrupted;
+  _interrupted = 0;
   return rc;
   return rc;
 }
 }
 
 
@@ -66,7 +66,7 @@ ml_getc (FILE *stream)
 	  return c;
 	  return c;
 	if (errno == EINTR)
 	if (errno == EINTR)
 	  {
 	  {
-	    if (_interrupt)
+	    if (_interrupted)
 	      break;
 	      break;
 	    /* keep going if we handled the signal */
 	    /* keep going if we handled the signal */
 	  }
 	  }
@@ -82,16 +82,16 @@ ml_readline_init ()
 {
 {
   if (!interactive)
   if (!interactive)
     return;
     return;
-  
+
 #ifdef WITH_READLINE
 #ifdef WITH_READLINE
   rl_readline_name = "mail";
   rl_readline_name = "mail";
   rl_attempted_completion_function = (CPPFunction*)ml_command_completion;
   rl_attempted_completion_function = (CPPFunction*)ml_command_completion;
   rl_getc_function = ml_getc;
   rl_getc_function = ml_getc;
 #endif
 #endif
   signal (SIGINT, sig_handler);
   signal (SIGINT, sig_handler);
-#if defined(SIGWINCH)      
+#if defined(SIGWINCH)
   signal (SIGWINCH, sig_handler);
   signal (SIGWINCH, sig_handler);
-#endif  
+#endif
 }
 }
 
 
 #ifdef WITH_READLINE
 #ifdef WITH_READLINE
@@ -110,7 +110,7 @@ int
 ml_reread (char *prompt, char **text)
 ml_reread (char *prompt, char **text)
 {
 {
   char *s;
   char *s;
-  
+
   insert_text = *text;
   insert_text = *text;
   rl_startup_hook = ml_insert_hook;
   rl_startup_hook = ml_insert_hook;
   s = readline (prompt);
   s = readline (prompt);
@@ -194,10 +194,10 @@ readline (const char *prompt)
       size_t n;
       size_t n;
 
 
       p = fgets (p, alloclen - linelen, stdin);
       p = fgets (p, alloclen - linelen, stdin);
-      
+
       if (p)
       if (p)
 	n = strlen(p);
 	n = strlen(p);
-      else if (_interrupt)
+      else if (_interrupted)
 	{
 	{
 	  free (line);
 	  free (line);
 	  return NULL;
 	  return NULL;

@@ -22,6 +22,7 @@
 # include <termios.h>
 # include <termios.h>
 #endif
 #endif
 #include <sys/ioctl.h>
 #include <sys/ioctl.h>
+#include <sys/fcntl.h>
 
 
 typedef struct _node {
 typedef struct _node {
   /* for the msglist expander */
   /* for the msglist expander */