- sprintf(CS big_buffer, "%s/input/%s/%s/%s",
- spool_directory, queue_name, message_subdir, name);
- if ((f = Ufopen(big_buffer, "rb"))) break;
- if (n != 0 || subdir_set || errno != ENOENT) return spool_read_notopen;
+
+ if ((f = Ufopen(spool_fname(US"input", message_subdir, name, US""), "rb")))
+ break;
+ if (n != 0 || subdir_set || errno != ENOENT)
+ return spool_read_notopen;