X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_maildir.c;h=95f72afb28792a286a7ce424f4fb335e4ee61dce;hp=1ba21c8f4ea5c7289e9c0f5b747fc189595cae6d;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 1ba21c8..95f72af 100644
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -20,16 +20,16 @@ static char mailfold[BUFSIZ];
 /*
 ** static prototypes
 */
-static char *exmaildir (char *);
+static char *exmaildir(char *);
 
 
 char *
-m_maildir (char *folder)
+m_maildir(char *folder)
 {
 	register char *cp, *ep;
 
-	if ((cp = exmaildir (folder))
-		&& (ep = cp + strlen (cp) - 1) > cp
+	if ((cp = exmaildir(folder))
+		&& (ep = cp + strlen(cp) - 1) > cp
 		&& *ep == '/')
 		*ep = '\0';
 
@@ -38,21 +38,21 @@ m_maildir (char *folder)
 
 
 char *
-m_mailpath (char *folder)
+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));
+		&& 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);
+		cp = path(folder, TFOLDER);
 	}
 
 	return cp;
@@ -60,7 +60,7 @@ m_mailpath (char *folder)
 
 
 static char *
-exmaildir (char *folder)
+exmaildir(char *folder)
 {
 	register char *cp, *pp;
 
@@ -68,28 +68,26 @@ exmaildir (char *folder)
 	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));
+	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 = context_find("path")) && *pp) {
 		if (*pp != '/') {
-			sprintf (cp, "%s/", mypath);
-			cp += strlen (cp);
+			sprintf(cp, "%s/", mypath);
+			cp += strlen(cp);
 		}
-		cp = copy (pp, cp);
+		cp = copy(pp, cp);
 	} else {
-		cp = copy (path ("./", TFOLDER), cp);
+		cp = copy(path("./", TFOLDER), cp);
 	}
 	if (cp[-1] != '/')
 		*cp++ = '/';
-	strcpy (cp, folder);
+	strcpy(cp, folder);
 
 	return mailfold;
 }