diff --git a/libremail/inc/libremail/common.h b/libremail/inc/libremail/common.h index 8c7b873..444d991 100644 --- a/libremail/inc/libremail/common.h +++ b/libremail/inc/libremail/common.h @@ -9,4 +9,10 @@ /* Length of SHA256 hash in bytes */ #define SHA256_N_BYTES 32 +/* Mailbox directory prefix */ +#define MAILBOX_PREFIX "/var/mail" + +/* Mailbox creation mode */ +#define DEFAULT_MAILBOX_MODE 0600 + #endif /* !LIBREMAIL_COMMON_H */ diff --git a/tools/mailutil/core/mailutil.c b/tools/mailutil/core/mailutil.c index 0c12269..435e646 100644 --- a/tools/mailutil/core/mailutil.c +++ b/tools/mailutil/core/mailutil.c @@ -8,6 +8,7 @@ #include #include #include "libremail/file.h" +#include "libremail/common.h" /* Maximum command components */ #define CMD_MAX_CNP 6 @@ -15,8 +16,6 @@ /* Mailutil version */ #define MAILUTIL_VERSION "0.0.1" -#define DEFAULT_MAILBOX_MODE 0600 - /* * Macro used to assert that the command list count is not * zero to avoid code duplication. @@ -65,7 +64,8 @@ cmd_mailbox_create(const char *cmdlist[CMD_MAX_CNP], size_t count) ASSERT_COUNT_N(count, 3); - snprintf(pathbuf, sizeof(pathbuf), "/var/mail/%s", cmdlist[2]); + snprintf(pathbuf, sizeof(pathbuf), "%s/%s", + MAILBOX_PREFIX, cmdlist[2]); /* Create the mailbox */ if (try_mkdir(pathbuf, DEFAULT_MAILBOX_MODE) < 0) { @@ -74,9 +74,7 @@ cmd_mailbox_create(const char *cmdlist[CMD_MAX_CNP], size_t count) return -1; } - printf("created mailbox '%s' @ %s\n", - cmdlist[2], pathbuf); - + printf("created mailbox '%s' @ %s\n", cmdlist[2], pathbuf); return 0; }