git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright year in (most) files (those that my script finds).
[exim.git]
/
src
/
src
/
queue.c
diff --git
a/src/src/queue.c
b/src/src/queue.c
index a443fdfd0077dc269682b26c5cad09572473b018..15b44f2a25a654429b3556a2e834cce736d30605 100644
(file)
--- a/
src/src/queue.c
+++ b/
src/src/queue.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/queue.c,v 1.
6 2005/06/07 15:20:56
ph10 Exp $ */
+/* $Cambridge: exim/src/src/queue.c,v 1.
9 2006/02/07 11:19:00
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
5
*/
+/* Copyright (c) University of Cambridge 1995 - 200
6
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Functions that operate on the input queue. */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions that operate on the input queue. */
@@
-594,7
+594,7
@@
for (i = (queue_run_in_order? -1 : 0);
if (queue_run_pipe == 0)
{
queue_run_pipe = dup(queue_run_pipe);
if (queue_run_pipe == 0)
{
queue_run_pipe = dup(queue_run_pipe);
- close(0);
+
(void)
close(0);
}
/* Before forking to deliver the message, ensure any open and cached
}
/* Before forking to deliver the message, ensure any open and cached
@@
-627,7
+627,7
@@
for (i = (queue_run_in_order? -1 : 0);
/* Close the writing end of the synchronizing pipe in this process,
then wait for the first level process to terminate. */
/* Close the writing end of the synchronizing pipe in this process,
then wait for the first level process to terminate. */
- close(pfd[pipe_write]);
+
(void)
close(pfd[pipe_write]);
set_process_info("running queue: waiting for %s (%d)", f->text, pid);
while (wait(&status) != pid);
set_process_info("running queue: waiting for %s (%d)", f->text, pid);
while (wait(&status) != pid);
@@
-873,7
+873,7
@@
for (; f != NULL; f = f->next)
big_buffer[n-1] = 0;
tree_add_nonrecipient(big_buffer);
}
big_buffer[n-1] = 0;
tree_add_nonrecipient(big_buffer);
}
- fclose(jread);
+
(void)
fclose(jread);
}
}
}
}
@@
-895,8
+895,8
@@
for (; f != NULL; f = f->next)
sprintf(CS big_buffer, "%s/input/%s/%s", spool_directory, message_subdir,
f->text);
if (Ustat(big_buffer, &statbuf) == 0)
sprintf(CS big_buffer, "%s/input/%s/%s", spool_directory, message_subdir,
f->text);
if (Ustat(big_buffer, &statbuf) == 0)
- printf("*** spool format error: size=
%.30g
***",
-
(double)
statbuf.st_size);
+ printf("*** spool format error: size=
" OFF_T_FMT "
***",
+ statbuf.st_size);
else printf("*** spool format error ***");
}
else printf("*** spool read error: %s ***", strerror(save_errno));
else printf("*** spool format error ***");
}
else printf("*** spool read error: %s ***", strerror(save_errno));
@@
-1019,9
+1019,9
@@
if (action >= MSG_SHOW_BODY)
}
while((rc = read(fd, big_buffer, big_buffer_size)) > 0)
}
while((rc = read(fd, big_buffer, big_buffer_size)) > 0)
- write(fileno(stdout), big_buffer, rc);
+
(void)
write(fileno(stdout), big_buffer, rc);
- close(fd);
+
(void)
close(fd);
return TRUE;
}
return TRUE;
}
@@
-1064,7
+1064,7
@@
if (spool_read_header(spoolname, TRUE, FALSE) != spool_read_OK)
printf("Spool format error for %s\n", spoolname);
if (action != MSG_REMOVE || !admin_user)
{
printf("Spool format error for %s\n", spoolname);
if (action != MSG_REMOVE || !admin_user)
{
- close(deliver_datafile);
+
(void)
close(deliver_datafile);
deliver_datafile = -1;
return FALSE;
}
deliver_datafile = -1;
return FALSE;
}
@@
-1079,7
+1079,7
@@
why we leave this check until after the headers are read. */
if (!admin_user && (action != MSG_REMOVE || real_uid != originator_uid))
{
printf("Permission denied\n");
if (!admin_user && (action != MSG_REMOVE || real_uid != originator_uid))
{
printf("Permission denied\n");
- close(deliver_datafile);
+
(void)
close(deliver_datafile);
deliver_datafile = -1;
return FALSE;
}
deliver_datafile = -1;
return FALSE;
}
@@
-1314,7
+1314,7
@@
switch(action)
/* Closing the datafile releases the lock and permits other processes
to operate on the message (if it still exists). */
/* Closing the datafile releases the lock and permits other processes
to operate on the message (if it still exists). */
-close(deliver_datafile);
+
(void)
close(deliver_datafile);
deliver_datafile = -1;
return yield;
}
deliver_datafile = -1;
return yield;
}