mawk, SunOS 4.1.3 nawk, and Ultrix/MKS nawk all barf on /[/]/, so change

[gnu-emacs] / lib-src / timer.c

diff --git a/lib-src/timer.c b/lib-src/timer.c
index 51642813fe3dad0aa148a531eced6efef8bf7350..4111b2bfb82b07ecf6a47d229498e76f567a5110 100644 (file)
--- a/lib-src/timer.c
+++ b/lib-src/timer.c
@@ -9,7 +9,7 @@
 
    This program is intended to be used with the lisp package called
    timer.el.  It was written anonymously in 1990.  This version was
-   documented and rewritten for portability by esr@snark,thyrsus.com,
+   documented and rewritten for portability by esr@snark.thyrsus.com,
    Aug 7 1992.  */
 
 #include <stdio.h>
@@ -124,6 +124,13 @@ notify ()
   time_t now, tdiff, waitfor = -1;
   register struct event *ep;
 
+  /* If an alarm timer runs out while this function is executing,
+     it could get called recursively.  This would be bad, because
+     it's not re-entrant.  So we must try to suspend the signal. */
+#ifdef sigmask
+  sighold(SIGIO);
+#endif
+
   now = time ((time_t *) NULL);
 
   for (ep = events; ep < events + num_events; ep++)
@@ -137,8 +144,8 @@ notify ()
 
        /* We now have a hole in the event array; fill it with the last
           event.  */
-       ep->token = events[num_events].token;
-       ep->reply_at = events[num_events].reply_at;
+       ep->token = events[num_events - 1].token;
+       ep->reply_at = events[num_events - 1].reply_at;
        num_events--;
 
        /* We ought to scan this event again.  */
@@ -154,6 +161,10 @@ notify ()
   /* If there are no more events, we needn't bother setting an alarm.  */
   if (num_events > 0)
     alarm (waitfor);
+
+#ifdef sigmask
+  sigrelse(SIGIO);
+#endif
 }
 
 void
@@ -213,7 +224,7 @@ getevent ()
   notify ();
 }
 
-void
+SIGTYPE
 sigcatch (sig)
      int sig;
 /* dispatch on incoming signal, then restore it */
@@ -262,10 +273,22 @@ main (argc, argv)
   signal (SIGTERM, sigcatch);
 
 #ifndef USG
-  fcntl (0, F_SETFL, FASYNC);
+  if (fcntl (0, F_SETOWN, getpid ()) == -1)
+    {
+      fprintf (stderr, "%s: can't set ownership of stdin\n", pname);
+      fprintf (stderr, "%s\n", sys_errlist[errno]);
+      exit (1);
+    }
+  if (fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) | FASYNC) == -1)
+    {
+      fprintf (stderr, "%s: can't request asynchronous I/O on stdin\n", pname);
+      fprintf (stderr, "%s\n", sys_errlist[errno]);
+      exit (1);
+    }
 #endif /* USG */
 
-  while (1) pause ();
+  for (;;)
+      pause ();
 }
 
 /* timer.c ends here */