summaryrefslogtreecommitdiffstats
path: root/debian/patches/75_21-tidy-log.c.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches/75_21-tidy-log.c.patch124
1 files changed, 124 insertions, 0 deletions
diff --git a/debian/patches/75_21-tidy-log.c.patch b/debian/patches/75_21-tidy-log.c.patch
new file mode 100644
index 0000000..b99f0c6
--- /dev/null
+++ b/debian/patches/75_21-tidy-log.c.patch
@@ -0,0 +1,124 @@
+From 8021b95c2e266861aba29c97b4bb90dc6f7637a2 Mon Sep 17 00:00:00 2001
+From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
+Date: Mon, 12 Apr 2021 09:19:21 +0200
+Subject: [PATCH 21/23] tidy log.c
+
+(cherry picked from commit 0327b6460eec64da6b0c1543c7e9b3d0f8cb9294)
+---
+ src/log.c | 97 +++++++++++++++++++++++----------------------------
+ 1 file changed, 44 insertions(+), 53 deletions(-)
+
+diff --git a/src/log.c b/src/log.c
+index 011c4debc..7ef7074ec 100644
+--- a/src/log.c
++++ b/src/log.c
+@@ -397,62 +397,53 @@ people want, I hope. */
+
+ ok = string_format(buffer, sizeof(buffer), CS file_path, log_names[type]);
+
+-/* Save the name of the mainlog for rollover processing. Without a datestamp,
+-it gets statted to see if it has been cycled. With a datestamp, the datestamp
+-will be compared. The static slot for saving it is the same size as buffer,
+-and the text has been checked above to fit, so this use of strcpy() is OK. */
+-
+-if (type == lt_main)
++switch (type)
+ {
+- Ustrcpy(mainlog_name, buffer);
+- if (string_datestamp_offset > 0)
+- mainlog_datestamp = mainlog_name + string_datestamp_offset;
+- }
+-
+-/* Ditto for the reject log */
+-
+-else if (type == lt_reject)
+- {
+- Ustrcpy(rejectlog_name, buffer);
+- if (string_datestamp_offset > 0)
+- rejectlog_datestamp = rejectlog_name + string_datestamp_offset;
+- }
+-
+-/* and deal with the debug log (which keeps the datestamp, but does not
+-update it) */
+-
+-else if (type == lt_debug)
+- {
+- Ustrcpy(debuglog_name, buffer);
+- if (tag)
+- {
+- /* this won't change the offset of the datestamp */
+- ok2 = string_format(buffer, sizeof(buffer), "%s%s",
+- debuglog_name, tag);
+- if (ok2)
+- Ustrcpy(debuglog_name, buffer);
+- }
+- }
+-
+-/* Remove any datestamp if this is the panic log. This is rare, so there's no
+-need to optimize getting the datestamp length. We remove one non-alphanumeric
+-char afterwards if at the start, otherwise one before. */
+-
+-else if (string_datestamp_offset >= 0)
+- {
+- uschar * from = buffer + string_datestamp_offset;
+- uschar * to = from + string_datestamp_length;
++ case lt_main:
++ /* Save the name of the mainlog for rollover processing. Without a datestamp,
++ it gets statted to see if it has been cycled. With a datestamp, the datestamp
++ will be compared. The static slot for saving it is the same size as buffer,
++ and the text has been checked above to fit, so this use of strcpy() is OK. */
++ Ustrcpy(mainlog_name, buffer);
++ if (string_datestamp_offset > 0)
++ mainlog_datestamp = mainlog_name + string_datestamp_offset;
++ case lt_reject:
++ /* Ditto for the reject log */
++ Ustrcpy(rejectlog_name, buffer);
++ if (string_datestamp_offset > 0)
++ rejectlog_datestamp = rejectlog_name + string_datestamp_offset;
++ case lt_debug:
++ /* and deal with the debug log (which keeps the datestamp, but does not
++ update it) */
++ Ustrcpy(debuglog_name, buffer);
++ if (tag)
++ {
++ /* this won't change the offset of the datestamp */
++ ok2 = string_format(buffer, sizeof(buffer), "%s%s",
++ debuglog_name, tag);
++ if (ok2)
++ Ustrcpy(debuglog_name, buffer);
++ }
++ default:
++ /* Remove any datestamp if this is the panic log. This is rare, so there's no
++ need to optimize getting the datestamp length. We remove one non-alphanumeric
++ char afterwards if at the start, otherwise one before. */
++ if (string_datestamp_offset >= 0)
++ {
++ uschar * from = buffer + string_datestamp_offset;
++ uschar * to = from + string_datestamp_length;
+
+- if (from == buffer || from[-1] == '/')
+- {
+- if (!isalnum(*to)) to++;
+- }
+- else
+- if (!isalnum(from[-1])) from--;
++ if (from == buffer || from[-1] == '/')
++ {
++ if (!isalnum(*to)) to++;
++ }
++ else
++ if (!isalnum(from[-1])) from--;
+
+- /* This copy is ok, because we know that to is a substring of from. But
+- due to overlap we must use memmove() not Ustrcpy(). */
+- memmove(from, to, Ustrlen(to)+1);
++ /* This copy is ok, because we know that to is a substring of from. But
++ due to overlap we must use memmove() not Ustrcpy(). */
++ memmove(from, to, Ustrlen(to)+1);
++ }
+ }
+
+ /* If the file name is too long, it is an unrecoverable disaster */
+--
+2.30.2
+