X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=95350afc7ad0a3a75fc31afe22979d02d81bfd8c;hb=2e0e7f94dd194cb2cda86e867ef11db6863805e5;hp=6eb6de68c3ac1b57d33083701c1787da964b7892;hpb=882ff5a53c3b4e440520a073cf07dc60b2671876;p=citadel.git

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 6eb6de68c..95350afc7 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -394,8 +394,7 @@ void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) {
 /*
  * Aliasing for network mail.
  */
-int alias(char *name)
-{				/* process alias and routing info for mail */
+int alias(char *name) {				/* process alias and routing info for mail */
 	int a;
 	char aaa[SIZ];
 	int at = 0;
@@ -571,8 +570,7 @@ struct recptypes *validate_recipients(const char *supplied_recipients, const cha
 				}
 				strcat(ret->recp_room, this_recp);
 			}
-			else if ( (!strncasecmp(this_recp, "room_", 5))
-				  && (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) {
+			else if ( (!strncasecmp(this_recp, "room_", 5)) && (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) {
 
 				/* Save room so we can restore it later */
 				tempQR2 = CCC->room;
@@ -722,8 +720,7 @@ void free_recipients(struct recptypes *valid) {
 }
 
 
-char *qp_encode_email_addrs(char *source)
-{
+char *qp_encode_email_addrs(char *source) {
 	char *user, *node, *name;
 	const char headerStr[] = "=?UTF-8?Q?";
 	char *Encoded;
@@ -758,20 +755,19 @@ char *qp_encode_email_addrs(char *source)
 			free (AddrPtr), AddrPtr = ptr;
 
 			ptr = (long *) malloc(sizeof (long) * nAddrPtrMax * 2);
-			memset(&ptr[nAddrPtrMax], 0, 
-			       sizeof (long) * nAddrPtrMax);
+			memset(&ptr[nAddrPtrMax], 0, sizeof (long) * nAddrPtrMax);
 
 			memcpy (ptr, AddrUtf8, sizeof (long) * nAddrPtrMax);
 			free (AddrUtf8), AddrUtf8 = ptr;
 			nAddrPtrMax *= 2;				
 		}
-		if (((unsigned char) source[i] < 32) || 
-		    ((unsigned char) source[i] > 126)) {
+		if (((unsigned char) source[i] < 32) || ((unsigned char) source[i] > 126)) {
 			need_to_encode = 1;
 			AddrUtf8[nColons] = 1;
 		}
-		if (source[i] == '"')
+		if (source[i] == '"') {
 			InQuotes = !InQuotes;
+		}
 		if (!InQuotes && source[i] == ',') {
 			AddrPtr[nColons] = i;
 			nColons++;
@@ -801,28 +797,19 @@ char *qp_encode_email_addrs(char *source)
 	for (i = 0; i < nColons && nPtr != NULL; i++) {
 		nmax = EncodedMaxLen - (nPtr - Encoded);
 		if (AddrUtf8[i]) {
-			process_rfc822_addr(&source[AddrPtr[i]], 
-					    user,
-					    node,
-					    name);
+			process_rfc822_addr(&source[AddrPtr[i]], user, node, name);
 			/* TODO: libIDN here ! */
 			if (IsEmptyStr(name)) {
-				n = snprintf(nPtr, nmax, 
-					     (i==0)?"%s@%s" : ",%s@%s",
-					     user, node);
+				n = snprintf(nPtr, nmax, (i==0)?"%s@%s" : ",%s@%s", user, node);
 			}
 			else {
 				EncodedName = rfc2047encode(name, strlen(name));			
-				n = snprintf(nPtr, nmax, 
-					     (i==0)?"%s <%s@%s>" : ",%s <%s@%s>",
-					     EncodedName, user, node);
+				n = snprintf(nPtr, nmax, (i==0)?"%s <%s@%s>" : ",%s <%s@%s>", EncodedName, user, node);
 				free(EncodedName);
 			}
 		}
 		else { 
-			n = snprintf(nPtr, nmax, 
-				     (i==0)?"%s" : ",%s",
-				     &source[AddrPtr[i]]);
+			n = snprintf(nPtr, nmax, (i==0)?"%s" : ",%s", &source[AddrPtr[i]]);
 		}
 		if (n > 0 )
 			nPtr += n;
@@ -884,8 +871,7 @@ void unfold_rfc822_field(char **field, char **FieldEnd)
 		else {
 			if (*sField=='\"') quote = 1 - quote;
 			if (!quote) {
-				if (isspace(*sField))
-				{
+				if (isspace(*sField)) {
 					*pField = ' ';
 					pField++;
 					sField++;
@@ -909,8 +895,7 @@ void unfold_rfc822_field(char **field, char **FieldEnd)
  * Split an RFC822-style address into userid, host, and full name
  *
  */
-void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
-{
+void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) {
 	int a;
 
 	strcpy(user, "");
@@ -1005,7 +990,6 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 	) {
 		strcpy(node, CtdlGetConfigStr("c_nodename"));
 	}
-
 	else {
 
 		/* strip anything to the left of a @ */