X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_maildir.c;h=15e4a66ad06c5dc2f05d7ed46f23a79591cd9545;hp=6c8c5841736fe08f9fc2e9b45f2e318031ec0ce0;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=f480c03187724e54e5391ee61b810827da319a6c diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c index 6c8c584..15e4a66 100644 --- a/sbr/m_maildir.c +++ b/sbr/m_maildir.c @@ -1,4 +1,3 @@ - /* * m_maildir.c -- get the path for the mail directory * @@ -9,12 +8,12 @@ #include -#define CWD "./" -#define NCWD (sizeof(CWD) - 1) -#define DOT "." -#define DOTDOT ".." -#define PWD "../" -#define NPWD (sizeof(PWD) - 1) +#define CWD "./" +#define NCWD (sizeof(CWD) - 1) +#define DOT "." +#define DOTDOT ".." +#define PWD "../" +#define NPWD (sizeof(PWD) - 1) static char mailfold[BUFSIZ]; @@ -27,70 +26,70 @@ static char *exmaildir (char *); char * m_maildir (char *folder) { - register char *cp, *ep; + register char *cp, *ep; - if ((cp = exmaildir (folder)) - && (ep = cp + strlen (cp) - 1) > cp - && *ep == '/') - *ep = '\0'; + if ((cp = exmaildir (folder)) + && (ep = cp + strlen (cp) - 1) > cp + && *ep == '/') + *ep = '\0'; - return cp; + return cp; } char * m_mailpath (char *folder) { - register char *cp; - char maildir[BUFSIZ]; - - if (*folder != '/' - && strncmp (folder, CWD, NCWD) - && strcmp (folder, DOT) - && strcmp (folder, DOTDOT) - && strncmp (folder, PWD, NPWD)) { - strncpy (maildir, mailfold, sizeof(maildir)); /* preserve... */ - cp = getcpy (m_maildir (folder)); - strncpy (mailfold, maildir, sizeof(mailfold)); - } else { - cp = path (folder, TFOLDER); - } - - return cp; + register char *cp; + char maildir[BUFSIZ]; + + if (*folder != '/' + && strncmp (folder, CWD, NCWD) + && strcmp (folder, DOT) + && strcmp (folder, DOTDOT) + && strncmp (folder, PWD, NPWD)) { + strncpy (maildir, mailfold, sizeof(maildir)); /* preserve... */ + cp = getcpy (m_maildir (folder)); + strncpy (mailfold, maildir, sizeof(mailfold)); + } else { + cp = path (folder, TFOLDER); + } + + return cp; } static char * exmaildir (char *folder) { - register char *cp, *pp; - - /* use current folder if none is specified */ - if (folder == NULL) - folder = getfolder(1); - - if (!(*folder != '/' - && strncmp (folder, CWD, NCWD) - && strcmp (folder, DOT) - && strcmp (folder, DOTDOT) - && strncmp (folder, PWD, NPWD))) { - strncpy (mailfold, folder, sizeof(mailfold)); - return mailfold; - } + register char *cp, *pp; + + /* use current folder if none is specified */ + if (folder == NULL) + folder = getfolder(1); + + if (!(*folder != '/' + && strncmp (folder, CWD, NCWD) + && strcmp (folder, DOT) + && strcmp (folder, DOTDOT) + && strncmp (folder, PWD, NPWD))) { + strncpy (mailfold, folder, sizeof(mailfold)); + return mailfold; + } - cp = mailfold; - if ((pp = context_find ("path")) && *pp) { - if (*pp != '/') { - sprintf (cp, "%s/", mypath); - cp += strlen (cp); + cp = mailfold; + if ((pp = context_find ("path")) && *pp) { + if (*pp != '/') { + sprintf (cp, "%s/", mypath); + cp += strlen (cp); + } + cp = copy (pp, cp); + } else { + cp = copy (path ("./", TFOLDER), cp); } - cp = copy (pp, cp); - } else { - cp = copy (path ("./", TFOLDER), cp); - } - if (cp[-1] != '/') - *cp++ = '/'; - strcpy (cp, folder); - - return mailfold; + if (cp[-1] != '/') + *cp++ = '/'; + strcpy (cp, folder); + + return mailfold; }