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
Copyright year updates.
[exim.git]
/
src
/
src
/
transports
/
tf_maildir.c
diff --git
a/src/src/transports/tf_maildir.c
b/src/src/transports/tf_maildir.c
index 26c999b0ce761a4697a961049b92bbe715cf5809..7a240b6c0f6c4b0f07a62cd2f0e6886d76c4d04b 100644
(file)
--- a/
src/src/transports/tf_maildir.c
+++ b/
src/src/transports/tf_maildir.c
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/src/transports/tf_maildir.c,v 1.11 2008/05/16 12:02:19 nm4 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
07
*/
+/* Copyright (c) University of Cambridge 1995 - 20
12
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Functions in support of the use of maildirsize files for handling quotas in
/* See the file NOTICE for conditions of use and distribution. */
/* Functions in support of the use of maildirsize files for handling quotas in
@@
-48,7
+46,7
@@
BOOL maildir_ensure_directories(uschar *path, address_item *addr,
{
int i;
struct stat statbuf;
{
int i;
struct stat statbuf;
-char *subdirs[] = { "/tmp", "/new", "/cur" };
+c
onst c
har *subdirs[] = { "/tmp", "/new", "/cur" };
DEBUG(D_transport)
debug_printf("ensuring maildir directories exist in %s\n", path);
DEBUG(D_transport)
debug_printf("ensuring maildir directories exist in %s\n", path);
@@
-62,16
+60,16
@@
loop so that code can be shared. */
for (i = 0; i < 4; i++)
{
int j;
for (i = 0; i < 4; i++)
{
int j;
- uschar *dir, *mdir;
+
const
uschar *dir, *mdir;
if (i == 0)
{
if (i == 0)
{
- mdir = US"";
+ mdir =
C
US"";
dir = path;
}
else
{
dir = path;
}
else
{
- mdir = US subdirs[i-1];
+ mdir =
C
US subdirs[i-1];
dir = mdir + 1;
}
dir = mdir + 1;
}
@@
-392,7
+390,7
@@
the same thing. */
filename = string_sprintf("%s/maildirsize", path);
DEBUG(D_transport) debug_printf("looking for maildirsize in %s\n", path);
filename = string_sprintf("%s/maildirsize", path);
DEBUG(D_transport) debug_printf("looking for maildirsize in %s\n", path);
-fd = Uopen(filename, O_RDWR|O_APPEND, 0600);
+fd = Uopen(filename, O_RDWR|O_APPEND,
ob->mode ? ob->mode :
0600);
if (fd < 0)
{
if (errno != ENOENT) return -1;
if (fd < 0)
{
if (errno != ENOENT) return -1;
@@
-557,9
+555,9
@@
else
(void)gettimeofday(&tv, NULL);
tempname = string_sprintf("%s/tmp/%lu.H%luP%lu.%s", path, tv.tv_sec,
(void)gettimeofday(&tv, NULL);
tempname = string_sprintf("%s/tmp/%lu.H%luP%lu.%s", path, tv.tv_sec,
- tv.tv_usec, getpid(), primary_hostname);
+ tv.tv_usec,
(long unsigned)
getpid(), primary_hostname);
- fd = Uopen(tempname, O_RDWR|O_CREAT|O_EXCL, 0600);
+ fd = Uopen(tempname, O_RDWR|O_CREAT|O_EXCL,
ob->mode ? ob->mode :
0600);
if (fd >= 0)
{
(void)sprintf(CS buffer, OFF_T_FMT "S,%dC\n" OFF_T_FMT " %d\n",
if (fd >= 0)
{
(void)sprintf(CS buffer, OFF_T_FMT "S,%dC\n" OFF_T_FMT " %d\n",
@@
-584,7
+582,7
@@
else
"a later subdirectory modification\n");
(void)Uunlink(filename);
(void)close(fd);
"a later subdirectory modification\n");
(void)Uunlink(filename);
(void)close(fd);
- fd = -
1
;
+ fd = -
2
;
}
}
}
}