ncurses 6.1 - patch 20180526

[ncurses.git] / ncurses / tinfo / lib_napms.c

diff --git a/ncurses/tinfo/lib_napms.c b/ncurses/tinfo/lib_napms.c
index f4975ad565bcaefa5f32c599a8e00671c07636f7..e1a0587028ed75e78b8f47542d42840299fe6d42 100644 (file)
--- a/ncurses/tinfo/lib_napms.c
+++ b/ncurses/tinfo/lib_napms.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -29,6 +29,8 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
+ *     and: Juergen Pfeifer                         2009                    *
  ****************************************************************************/
 
 /*
@@ -36,6 +38,8 @@
  *
  *     The routine napms.
  *
+ *     (This file was originally written by Eric Raymond; however except for
+ *     comments, none of the original code remains - T.Dickey).
  */
 
 #include <curses.priv.h>
@@ -47,23 +51,41 @@
 #endif
 #endif
 
-MODULE_ID("$Id: lib_napms.c,v 1.13 2002/09/01 17:46:11 tom Exp $")
+MODULE_ID("$Id: lib_napms.c,v 1.25 2017/07/01 21:05:56 tom Exp $")
 
 NCURSES_EXPORT(int)
-napms(int ms)
+NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
 {
     T((T_CALLED("napms(%d)"), ms));
 
+#ifdef USE_TERM_DRIVER
+    CallDriver_1(SP_PARM, td_nap, ms);
+#else /* !USE_TERM_DRIVER */
+#if NCURSES_SP_FUNCS
+    (void) sp;
+#endif
 #if HAVE_NANOSLEEP
     {
-       struct timespec ts;
-       ts.tv_sec = ms / 1000;
-       ts.tv_nsec = (ms % 1000) * 1000000;
-       nanosleep(&ts, NULL);
+       struct timespec request, remaining;
+       request.tv_sec = ms / 1000;
+       request.tv_nsec = (ms % 1000) * 1000000;
+       while (nanosleep(&request, &remaining) == -1
+              && errno == EINTR) {
+           request = remaining;
+       }
     }
 #else
-    _nc_timed_wait(0, ms, (int *) 0 EVENTLIST_2nd(0));
+    _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
 #endif
+#endif /* !USE_TERM_DRIVER */
 
     returnCode(OK);
 }
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+napms(int ms)
+{
+    return NCURSES_SP_NAME(napms) (CURRENT_SCREEN, ms);
+}
+#endif