- message_subdir[0] = split_spool_directory == (i == 0) ? message_id[5] : 0;
- snprintf(CS mbox_path, sizeof(mbox_path), "%s/input/%s/%s/%s-D",
- spool_directory, queue_name, message_subdir, message_id);
- if ((data_file = Ufopen(mbox_path,"rb")))
+ uschar message_subdir[2];
+ set_subdir_str(message_subdir, message_id, i);
+ if ((data_file = Ufopen(
+ spool_fname(US"input", message_subdir, message_id, US"-D"),
+ "rb")))