forked from pool/emacs
67 lines
1.5 KiB
Diff
67 lines
1.5 KiB
Diff
--- emacs-21.3/lib-src/movemail.c
|
||
+++ emacs-21.3/lib-src/movemail.c
|
||
@@ -245,7 +245,7 @@
|
||
#endif
|
||
|
||
if (*outname == 0)
|
||
- fatal ("Destination file name is empty", 0);
|
||
+ fatal ("Destination file name is empty", 0, 0);
|
||
|
||
/* Check access to output file. */
|
||
if (access (outname, F_OK) == 0 && access (outname, W_OK) != 0)
|
||
@@ -601,12 +601,12 @@
|
||
/* Print error message and exit. */
|
||
|
||
void
|
||
-fatal (s1, s2)
|
||
- char *s1, *s2;
|
||
+fatal (s1, s2, s3)
|
||
+ char *s1, *s2, *s3;
|
||
{
|
||
if (delete_lockname)
|
||
unlink (delete_lockname);
|
||
- error (s1, s2, 0);
|
||
+ error (s1, s2, s3);
|
||
exit (1);
|
||
}
|
||
|
||
@@ -631,17 +631,16 @@
|
||
pfatal_with_name (name)
|
||
char *name;
|
||
{
|
||
- char *s = concat ("", strerror (errno), " for %s");
|
||
- fatal (s, name);
|
||
+ fatal ("%s for %s", strerror (errno), name);
|
||
}
|
||
|
||
void
|
||
pfatal_and_delete (name)
|
||
char *name;
|
||
{
|
||
- char *s = concat ("", strerror (errno), " for %s");
|
||
+ char *s = strerror (errno);
|
||
unlink (name);
|
||
- fatal (s, name);
|
||
+ fatal ("%s for %s", s, name);
|
||
}
|
||
|
||
/* Return a newly-allocated string whose contents concatenate those of s1, s2, s3. */
|
||
@@ -669,7 +668,7 @@
|
||
{
|
||
long *result = (long *) malloc (size);
|
||
if (!result)
|
||
- fatal ("virtual memory exhausted", 0);
|
||
+ fatal ("virtual memory exhausted", 0, 0);
|
||
return result;
|
||
}
|
||
|
||
@@ -787,7 +786,7 @@
|
||
mbx_delimit_begin (mbf);
|
||
if (pop_retr (server, i, mbf) != OK)
|
||
{
|
||
- error (Errmsg, 0, 0);
|
||
+ error ("%s", Errmsg, 0);
|
||
close (mbfi);
|
||
return (1);
|
||
}
|