Appendfile: when evaluating quota use attemd to link counts

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 8bba6feb21d04a198040005b8a3c4a1e9e06ba5d..63db8ef707902698dd85819f785ca7639e290690 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -22859,6 +22859,15 @@ sometimes add other information onto the ends of message filenames.
 
 Section &<<SECID136>>& contains further information.
 
 
 Section &<<SECID136>>& contains further information.
 

+.new
+This option should not be used when other message-handling software
+may duplicate messages by making hardlinks to the files.  When that is done Exim
+will count the message size once for each filename, in contrast with the actual
+disk usage.  When the option is not set, calculating total usage requires
+a system-call per file to get the size; the number of links is then available also
+as is used to adjust the effective size.
+.wen
+

 
 .option quota_warn_message appendfile string&!! "see below"
 See below for the use of this option. If it is not set when
 
 .option quota_warn_message appendfile string&!! "see below"
 See below for the use of this option. If it is not set when

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 6d1b2631bb81f74d3d74f1035662d860c77642e7..c3972d2dae4b902ef4aa8211eed6bf741929eaad 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -164,12 +164,15 @@ JH/34 Fix crash after TLS shutdown.  When the TCP/SMTP channel was left open,
 JH/35 Bug 2409: filter out-of-spec chars from callout response before using
       them in our smtp response.
 
 JH/35 Bug 2409: filter out-of-spec chars from callout response before using
       them in our smtp response.
 

-JH/35 Have the general router option retry_use_local_part default to true when
+JH/36 Have the general router option retry_use_local_part default to true when

       any of the restrictive preconditions are set (to anything).  Previously it
       was only for check_local user.  The change removes one item of manual
       configuration which is required for proper retries when a remote router
       handles a subset of addresses for a domain.
 
       any of the restrictive preconditions are set (to anything).  Previously it
       was only for check_local user.  The change removes one item of manual
       configuration which is required for proper retries when a remote router
       handles a subset of addresses for a domain.
 

+JH/37 Appendfile: when evaluating quota use (non-quota_size_regex) take the file
+      link count into consideration.
+

 
 Exim version 4.92
 -----------------
 
 Exim version 4.92
 -----------------

diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
index 5d23008f85e6b536c1b22f75fe800a2e59140e5f..8f26c71ba3b7e99b949369c207c28c89e3c1c581 100644 (file)
--- a/src/src/transports/appendfile.c
+++ b/src/src/transports/appendfile.c
@@ -773,10 +773,9 @@ int count = *countptr;
 struct dirent *ent;
 struct stat statbuf;
 
 struct dirent *ent;
 struct stat statbuf;
 

-dir = opendir(CS dirname);
-if (dir == NULL) return 0;
+if (!(dir = opendir(CS dirname))) return 0;

 
 

-while ((ent = readdir(dir)) != NULL)
+while ((ent = readdir(dir)))

   {
   uschar * path, * name = US ent->d_name;
 
   {
   uschar * path, * name = US ent->d_name;
 


@@ -815,13 +814,12 @@ while ((ent = readdir(dir)) != NULL)
     DEBUG(D_transport)
       debug_printf("check_dir_size: stat error %d for %s: %s\n", errno, path,
         strerror(errno));
     DEBUG(D_transport)
       debug_printf("check_dir_size: stat error %d for %s: %s\n", errno, path,
         strerror(errno));

-    continue;

     }
     }

-
-  if ((statbuf.st_mode & S_IFMT) == S_IFREG)
-    sum += statbuf.st_size;
-  else if ((statbuf.st_mode & S_IFMT) == S_IFDIR)
-    sum += check_dir_size(path, &count, regex);
+  else
+    if ((statbuf.st_mode & S_IFMT) == S_IFREG)
+      sum += statbuf.st_size / statbuf.st_nlink;
+    else if ((statbuf.st_mode & S_IFMT) == S_IFDIR)
+      sum += check_dir_size(path, &count, regex);

   }
 
 closedir(dir);
   }
 
 closedir(dir);