* This file contains functions which handle the mapping of Internet addresses
* to users on the Citadel system.
*
- * Copyright (c) 1987-2018 by the citadel.org team
+ * Copyright (c) 1987-2020 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
if (start != NULL)
FindNextEnd (start, end);
- while ((start != NULL) && (end != NULL))
- {
+ while ((start != NULL) && (end != NULL)) {
next = strstr(end, "=?");
if (next != NULL)
FindNextEnd(next, nextend);
next = NULL;
/* did we find two partitions */
- if ((next != NULL) &&
- ((next - end) > 2))
- {
+ if ((next != NULL) && ((next - end) > 2)) {
ptr = end + 2;
while ((ptr < next) &&
(isspace(*ptr) ||
*/
start = strstr(buf, "=?");
FindNextEnd((start != NULL)? start : buf, end);
- while (start != NULL && end != NULL && end > start)
- {
+ while (start != NULL && end != NULL && end > start) {
extract_token(charset, start, 1, '?', sizeof charset);
extract_token(encoding, start, 2, '?', sizeof encoding);
extract_token(istr, start, 3, '?', sizeof istr);
len = strlen(istr);
pos = 0;
- while (pos < len)
- {
+ while (pos < len) {
if (istr[pos] == '_') istr[pos] = ' ';
pos++;
}
-
ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
}
else {
/* If the last item in a list of recipients was truncated to a partial address,
- * remove it completely in order to avoid choking libSieve
+ * remove it completely in order to avoid choking library functions.
*/
void sanitize_truncated_recipient(char *str)
{
* This function is self explanatory.
* (What can I say, I'm in a weird mood today...)
*/
-void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name)
-{
+void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) {
unsigned int i;
for (i = 0; i < strlen(name); ++i) {
*
* Caller needs to free the result using free_recipients()
*/
-recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags)
-{
+recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags) {
struct CitContext *CCC = CC;
recptypes *ret;
char *recipients = NULL;
Flags,
0 /* 0 = not a reply */
);
- if (err)
- {
+ if (err) {
++ret->num_error;
invalid = 1;
}
}
free(org_recp);
- if ( (ret->num_local + ret->num_internet + ret->num_room + ret->num_error) == 0)
- {
+ if ( (ret->num_local + ret->num_internet + ret->num_room + ret->num_error) == 0) {
ret->num_error = (-1);
strcpy(ret->errormsg, "No recipients specified.");
}
{
if ((*sField=='\r') || (*sField=='\n'))
{
- int Offset = 1;
- while (((*(sField + Offset) == '\r') ||
- (*(sField + Offset) == '\n') ||
- (isspace(*(sField + Offset)))) &&
- (sField + Offset < pFieldEnd))
- Offset ++;
- sField += Offset;
+ int offset = 1;
+ while ( ( (*(sField + offset) == '\r') || (*(sField + offset) == '\n' )) && (sField + offset < pFieldEnd) ) {
+ offset ++;
+ }
+ sField += offset;
*pField = *sField;
}
else {
/*
* Helper function for CtdlRebuildDirectoryIndex()
- *
- * Call this function as a ForEachUser backend in order to queue up
- * user names, or call it with a null user to make it do the processing.
- * This allows us to maintain the list as a static instead of passing
- * pointers around.
*/
-void CtdlRebuildDirectoryIndex_backend(struct ctdluser *usbuf, void *data) {
+void CtdlRebuildDirectoryIndex_backend(char *username, void *data) {
- struct crdib {
- char name[64];
- char emails[512];
- };
-
- static struct crdib *e = NULL;
- static int num_e = 0;
- static int alloc_e = 0;
-
- /* this is the calling mode where we add a user */
+ int j = 0;
+ struct ctdluser usbuf;
- if (usbuf != NULL) {
- if (num_e >= alloc_e) {
- if (alloc_e == 0) {
- alloc_e = 100;
- e = malloc(sizeof(struct crdib) * alloc_e);
- }
- else {
- alloc_e *= 2;
- e = realloc(e, (sizeof(struct crdib) * alloc_e));
- }
- }
- strcpy(e[num_e].name, usbuf->fullname);
- strcpy(e[num_e].emails, usbuf->emailaddrs);
- ++num_e;
+ if (CtdlGetUser(&usbuf, username) != 0) {
return;
}
- /* this is the calling mode where we do the processing */
-
- int i, j;
- for (i=0; i<num_e; ++i) {
- if ( (!IsEmptyStr(e[i].name)) && (!IsEmptyStr(e[i].emails)) ) {
- for (j=0; j<num_tokens(e[i].emails, '|'); ++j) {
- char one_email[512];
- extract_token(one_email, e[i].emails, j, '|', sizeof one_email);
- CtdlDirectoryAddUser(one_email, e[i].name);
- }
+ if ( (!IsEmptyStr(usbuf.fullname)) && (!IsEmptyStr(usbuf.emailaddrs)) ) {
+ for (j=0; j<num_tokens(usbuf.emailaddrs, '|'); ++j) {
+ char one_email[512];
+ extract_token(one_email, usbuf.emailaddrs, j, '|', sizeof one_email);
+ CtdlDirectoryAddUser(one_email, usbuf.fullname);
}
}
- free(e);
- num_e = 0;
- alloc_e = 0;
- return;
}
syslog(LOG_INFO, "internet_addressing: rebuilding email address directory index");
cdb_trunc(CDB_DIRECTORY);
ForEachUser(CtdlRebuildDirectoryIndex_backend, NULL);
- CtdlRebuildDirectoryIndex_backend(NULL, NULL);
}
projects / citadel.git / blobdiff