Merge remote-tracking branch 'origin/master' into feature/android

This commit is contained in:
Po Lu 2023-05-15 10:38:10 +08:00
commit a46e231a5f
94 changed files with 1574 additions and 539 deletions

View file

@ -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;

View file

@ -470,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 */