X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fpath.c;h=b19415ab5eedb74d703569776c5e996ab6c670fc;hp=502ad97a1b025426eb5eaa2b79174abe1bf20179;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/sbr/path.c b/sbr/path.c
index 502ad97..b19415a 100644
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -34,8 +34,8 @@ path(char *name, int flag)
 {
 	register char *cp, *ep;
 
-	if ((cp = expath (name, flag))
-		&& (ep = cp + strlen (cp) - 1) > cp
+	if ((cp = expath(name, flag))
+		&& (ep = cp + strlen(cp) - 1) > cp
 		&& *ep == '/')
 		*ep = '\0';
 
@@ -44,62 +44,62 @@ path(char *name, int flag)
 
 
 static char *
-expath (char *name, int flag)
+expath(char *name, int flag)
 {
 	register char *cp, *ep;
 	char buffer[BUFSIZ];
 
 	if (flag == TSUBCWF) {
-		snprintf (buffer, sizeof(buffer), "%s/%s", getfolder (1), name);
-		name = m_mailpath (buffer);
-		compath (name);
-		snprintf (buffer, sizeof(buffer), "%s/", m_maildir (""));
-		if (ssequal (buffer, name)) {
+		snprintf(buffer, sizeof(buffer), "%s/%s", getfolder(1), name);
+		name = m_mailpath(buffer);
+		compath(name);
+		snprintf(buffer, sizeof(buffer), "%s/", m_maildir(""));
+		if (ssequal(buffer, name)) {
 			cp = name;
-			name = getcpy (name + strlen (buffer));
-			free (cp);
+			name = getcpy(name + strlen(buffer));
+			free(cp);
 		}
 		flag = TFOLDER;
 	}
 
 	if (*name == '/' || (flag == TFOLDER
-		&& (strncmp (name, CWD, NCWD) && strcmp (name, DOT)
-		&& strcmp (name, DOTDOT) && strncmp (name, PWD, NPWD))))
-		return getcpy (name);
+		&& (strncmp(name, CWD, NCWD) && strcmp(name, DOT)
+		&& strcmp(name, DOTDOT) && strncmp(name, PWD, NPWD))))
+		return getcpy(name);
 
 	if (pwds == NULL)
-		pwds = pwd ();
+		pwds = pwd();
 
-	if (strcmp (name, DOT) == 0 || strcmp (name, CWD) == 0)
-		return getcpy (pwds);
+	if (strcmp(name, DOT) == 0 || strcmp(name, CWD) == 0)
+		return getcpy(pwds);
 
-	ep = pwds + strlen (pwds);
+	ep = pwds + strlen(pwds);
 	if ((cp = strrchr(pwds, '/')) == NULL)
 		cp = ep;
 	else
 		if (cp == pwds)
 			cp++;
 
-	if (strncmp (name, CWD, NCWD) == 0)
+	if (strncmp(name, CWD, NCWD) == 0)
 		name += NCWD;
 
-	if (strcmp (name, DOTDOT) == 0 || strcmp (name, PWD) == 0) {
-		snprintf (buffer, sizeof(buffer), "%.*s", (int)(cp - pwds), pwds);
-		return getcpy (buffer);
+	if (strcmp(name, DOTDOT) == 0 || strcmp(name, PWD) == 0) {
+		snprintf(buffer, sizeof(buffer), "%.*s", (int)(cp - pwds), pwds);
+		return getcpy(buffer);
 	}
 
-	if (strncmp (name, PWD, NPWD) == 0)
+	if (strncmp(name, PWD, NPWD) == 0)
 		name += NPWD;
 	else
 		cp = ep;
 
-	snprintf (buffer, sizeof(buffer), "%.*s/%s", (int)(cp - pwds), pwds, name);
-	return getcpy (buffer);
+	snprintf(buffer, sizeof(buffer), "%.*s/%s", (int)(cp - pwds), pwds, name);
+	return getcpy(buffer);
 }
 
 
 static void
-compath (char *f)
+compath(char *f)
 {
 	register char *cp, *dp;
 
@@ -121,13 +121,13 @@ compath (char *f)
 					continue;
 
 				case '.':
-					if (strcmp (cp, DOT) == 0) {
+					if (strcmp(cp, DOT) == 0) {
 						if (cp > f + 1)
 							cp--;
 						*cp = '\0';
 						break;
 					}
-					if (strcmp (cp, DOTDOT) == 0) {
+					if (strcmp(cp, DOTDOT) == 0) {
 						for (cp -= 2; cp > f; cp--)
 							if (*cp == '/')
 								break;
@@ -136,18 +136,18 @@ compath (char *f)
 						*cp = '\0';
 						break;
 					}
-					if (strncmp (cp, PWD, NPWD) == 0) {
+					if (strncmp(cp, PWD, NPWD) == 0) {
 						for (dp = cp - 2; dp > f; dp--)
 							if (*dp == '/')
 								break;
 						if (dp <= f)
 							dp = f;
-						strcpy (dp, cp + NPWD - 1);
+						strcpy(dp, cp + NPWD - 1);
 						cp = dp;
 						continue;
 					}
-					if (strncmp (cp, CWD, NCWD) == 0) {
-						strcpy (cp - 1, cp + NCWD - 1);
+					if (strncmp(cp, CWD, NCWD) == 0) {
+						strcpy(cp - 1, cp + NCWD - 1);
 						cp--;
 						continue;
 					}