Merge branch 'master' into scratch/comp-static-data

4 files changed, 11 insertions, 10 deletions

diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 371fa6c938b..4b71f7447e0 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -3767,8 +3767,9 @@ main (int argc, char **argv)
           if (n_input_files == input_filenames_size)
             {
               input_filenames_size = max (10, 2 * input_filenames_size);
-              input_filenames = (char **) xrealloc ((void *)input_filenames,
-                                                    input_filenames_size);
+              input_filenames = xrealloc (input_filenames,
+                                          (input_filenames_size
+                                           * sizeof *input_filenames));
             }
           input_filenames[n_input_files++] = xstrdup (optarg);
           break;
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 2c6b4e7a630..147ecbd7c1b 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -109,6 +109,7 @@ University of California, as described above. */
 #include <limits.h>
 #include <unistd.h>
 #include <stdarg.h>
+#include <stdckdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sysstdio.h>
@@ -8038,7 +8039,7 @@ xnmalloc (ptrdiff_t nitems, ptrdiff_t item_size)
   ptrdiff_t nbytes;
   assume (0 <= nitems);
   assume (0 < item_size);
-  if (INT_MULTIPLY_WRAPV (nitems, item_size, &nbytes))
+  if (ckd_mul (&nbytes, nitems, item_size))
     memory_full ();
   return xmalloc (nbytes);
 }
@@ -8049,7 +8050,7 @@ xnrealloc (void *pa, ptrdiff_t nitems, ptrdiff_t item_size)
   ptrdiff_t nbytes;
   assume (0 <= nitems);
   assume (0 < item_size);
-  if (INT_MULTIPLY_WRAPV (nitems, item_size, &nbytes) || SIZE_MAX < nbytes)
+  if (ckd_mul (&nbytes, nitems, item_size) || SIZE_MAX < nbytes)
     memory_full ();
   void *result = realloc (pa, nbytes);
   if (!result)
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 8119046a916..6a772e9043e 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -62,6 +62,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <stdlib.h>
 #include <errno.h>
 #include <time.h>
+#include <timespec.h>
 
 #include <getopt.h>
 #include <unistd.h>
@@ -469,7 +470,7 @@ main (int argc, char **argv)
              that were set on the file.  Better to just empty the file.  */
           if (unlink (inname) < 0 && errno != ENOENT)
 #endif /* MAIL_UNLINK_SPOOL */
-            creat (inname, 0600);
+            close (creat (inname, 0600));
         }
 #endif /* not MAIL_USE_SYSTEM_LOCK */
 
@@ -846,7 +847,7 @@ movemail_strftime (char *s, size_t size, char const *format,
 static bool
 mbx_delimit_begin (FILE *mbf)
 {
-  time_t now = time (NULL);
+  time_t now = current_timespec ().tv_sec;
   struct tm *ltime = localtime (&now);
   if (!ltime)
     return false;
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 83167f59b8a..4592e14d1d6 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -185,8 +185,6 @@ main (int argc, char **argv)
   ptrdiff_t scorecount, scorealloc;
   ptrdiff_t max_scores = MAX_SCORES;
 
-  srand (time (0));
-
   while ((c = getopt (argc, argv, "hrm:d:")) != -1)
     switch (c)
       {
@@ -485,8 +483,8 @@ lock_file (const char *filename, void **state)
             return -1;
           attempts = 0;
         }
-
-      sleep ((rand () & 1) + 1);
+      else
+        sleep (1);
     }
 
   close (fd);