shift queue name use up to top layer in spooldir hierachy

[exim.git] / src / src / queue.c

diff --git a/src/src/queue.c b/src/src/queue.c
index d8c2760137d3e8151aa3a0db5dea4e0db7886e8d..f53759c43ee0e92bf1a6e346dd5d4cbea5cbec1e 100644 (file)
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -12,49 +12,50 @@
 
 
 
-/* The number of nodes to use for the bottom-up merge sort when a list of queue
-items is to be ordered. The code for this sort was contributed as a patch by
-Michael Haardt. */
-
-#define LOG2_MAXNODES 32
-
-
-
 /* Routines with knowlege of spool layout */
 
 static void
 spool_pname_buf(uschar * buf, int len)
 {
-snprintf(CS buf, len, "%s/input/%s", spool_directory, queue_name);
+snprintf(CS buf, len, "%s/%s/input", spool_directory, queue_name);
 }
 
 static uschar *
 spool_dname(const uschar * purpose, uschar * subdir)
 {
 return string_sprintf("%s/%s/%s/%s",
-       spool_directory, purpose, queue_name, subdir);
+       spool_directory, queue_name, purpose, subdir);
 }
 
 uschar *
 spool_sname(const uschar * purpose, uschar * subdir)
 {
 return string_sprintf("%s%s%s%s%s",
+                   queue_name, *queue_name ? "/" : "",
                    purpose,
-                   *queue_name ? "/" : "", queue_name,
-                   *message_subdir ? "/" : "", message_subdir);
+                   *subdir ? "/" : "", subdir);
 }
 
 uschar *
 spool_fname(const uschar * purpose, uschar * subdir, uschar * fname, uschar * suffix)
 {
 return string_sprintf("%s/%s/%s/%s/%s%s",
-       spool_directory, purpose, queue_name, subdir, fname, suffix);
+       spool_directory, queue_name, purpose, subdir, fname, suffix);
 }
 
 
 
 
 #ifndef COMPILE_UTILITY
+
+/* The number of nodes to use for the bottom-up merge sort when a list of queue
+items is to be ordered. The code for this sort was contributed as a patch by
+Michael Haardt. */
+
+#define LOG2_MAXNODES 32
+
+
+
 /*************************************************
 *  Helper sort function for queue_get_spool_list *
 *************************************************/