From: Art Cancro <ajc@citadel.org>
Date: Sat, 19 Nov 2022 21:20:33 +0000 (-0500)
Subject: striplt() is now string_trim()
X-Git-Tag: v960~17
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=6957096b74edcaa677c056cff53cdd7e974cc605

striplt() is now string_trim()
---

diff --git a/citadel/server/internet_addressing.c b/citadel/server/internet_addressing.c
index d9a363a23..59a1b91b2 100644
--- a/citadel/server/internet_addressing.c
+++ b/citadel/server/internet_addressing.c
@@ -174,8 +174,8 @@ int expand_aliases(char *name, char *aliases) {
 			if (bar) {
 				bar[0] = 0;
 				++bar;
-				striplt(aaa);
-				striplt(bar);
+				string_trim(aaa);
+				string_trim(bar);
 				if ( (!IsEmptyStr(aaa)) && (!strcasecmp(name, aaa)) ) {
 					syslog(LOG_DEBUG, "internet_addressing: global alias <%s> to <%s>", name, bar);
 					strcpy(name, bar);
@@ -191,7 +191,7 @@ int expand_aliases(char *name, char *aliases) {
 	safestrncpy(original_name, name, sizeof original_name);
 
 	// should these checks still be here, or maybe move them to split_recps() ?
-	striplt(name);
+	string_trim(name);
 	remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
 	stripallbut(name, '<', '>');
 
@@ -277,7 +277,7 @@ Array *split_recps(char *addresses, Array *append_to) {
 	for (i=0; i<num_addresses; ++i) {
 		char this_address[256];
 		extract_token(this_address, a, i, ',', sizeof this_address);
-		striplt(this_address);				// strip leading and trailing whitespace
+		string_trim(this_address);				// strip leading and trailing whitespace
 		stripout(this_address, '(', ')');		// remove any portion in parentheses
 		stripallbut(this_address, '<', '>');		// if angle brackets are present, keep only what is inside them
 		if (!IsEmptyStr(this_address)) {
@@ -795,9 +795,9 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 	}
 
 	// strip leading and trailing spaces in all strings
-	striplt(user);
-	striplt(node);
-	striplt(name);
+	string_trim(user);
+	string_trim(node);
+	string_trim(name);
 
 	// If we processed a string that had the address in angle brackets
 	// but no name outside the brackets, we now have an empty name.  In
@@ -1141,11 +1141,11 @@ char *rfc822_fetch_field(const char *rfc822, const char *fieldname) {
 		strcat(fieldbuf, " ");
 		cont = &fieldbuf[strlen(fieldbuf)];
 		ptr = cmemreadline(ptr, cont, SIZ-strlen(fieldbuf) );
-		striplt(cont);
+		string_trim(cont);
 	}
 
 	strcpy(fieldbuf, &fieldbuf[strlen(fieldhdr)]);
-	striplt(fieldbuf);
+	string_trim(fieldbuf);
 
 	return(fieldbuf);
 }
@@ -1182,7 +1182,7 @@ int IsDirectory(char *addr, int allow_masq_domains) {
 	int h;
 
 	extract_token(domain, addr, 1, '@', sizeof domain);
-	striplt(domain);
+	string_trim(domain);
 
 	h = CtdlHostAlias(domain);
 
@@ -1319,7 +1319,7 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
 					if (!IsEmptyStr(coll)) {
 						strcat(coll, ",");
 					}
-					striplt(addr);
+					string_trim(addr);
 					strcat(coll, addr);
 				}
 			}
diff --git a/citadel/server/ldap.c b/citadel/server/ldap.c
index 87e6c1574..21624ad9d 100644
--- a/citadel/server/ldap.c
+++ b/citadel/server/ldap.c
@@ -126,8 +126,8 @@ LDAP *ctdl_ldap_bind(void) {
 	ldap_set_option(ldserver, LDAP_OPT_PROTOCOL_VERSION, &ctdl_require_ldap_version);
 	ldap_set_option(ldserver, LDAP_OPT_REFERRALS, (void *)LDAP_OPT_OFF);
 
-	striplt(CtdlGetConfigStr("c_ldap_bind_dn"));
-	striplt(CtdlGetConfigStr("c_ldap_bind_pw"));
+	string_trim(CtdlGetConfigStr("c_ldap_bind_dn"));
+	string_trim(CtdlGetConfigStr("c_ldap_bind_pw"));
 	i = ldap_simple_bind_s(ldserver,
 		(!IsEmptyStr(CtdlGetConfigStr("c_ldap_bind_dn")) ? CtdlGetConfigStr("c_ldap_bind_dn") : NULL),
 		(!IsEmptyStr(CtdlGetConfigStr("c_ldap_bind_pw")) ? CtdlGetConfigStr("c_ldap_bind_pw") : NULL)
diff --git a/citadel/server/modules/autocompletion/serv_autocompletion.c b/citadel/server/modules/autocompletion/serv_autocompletion.c
index 7ce241d03..fb225ddb4 100644
--- a/citadel/server/modules/autocompletion/serv_autocompletion.c
+++ b/citadel/server/modules/autocompletion/serv_autocompletion.c
@@ -41,7 +41,7 @@ char *n_to_fn(char *value) {
 	for (i=0; i<strlen(nnn); ++i) {
 		if (!strncmp(&nnn[i], "  ", 2)) strcpy(&nnn[i], &nnn[i+1]);
 	}
-	striplt(nnn);
+	string_trim(nnn);
 	return(nnn);
 }
 
diff --git a/citadel/server/modules/calendar/serv_calendar.c b/citadel/server/modules/calendar/serv_calendar.c
index 61f3d73ca..6ae4e37f1 100644
--- a/citadel/server/modules/calendar/serv_calendar.c
+++ b/citadel/server/modules/calendar/serv_calendar.c
@@ -207,7 +207,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
 			ch = icalproperty_get_attendee(attendee);
 			if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
 				safestrncpy(attendee_string, ch + 7, sizeof (attendee_string));
-				striplt(attendee_string);
+				string_trim(attendee_string);
 				recp = validate_recipients(attendee_string, NULL, 0);
 				if (recp != NULL) {
 					if (!strcasecmp(recp->recp_local, CC->user.fullname)) {
@@ -254,7 +254,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
 		}
 		if (!strncasecmp(organizer_string, "MAILTO:", 7)) {
 			strcpy(organizer_string, &organizer_string[7]);
-			striplt(organizer_string);
+			string_trim(organizer_string);
 		} else {
 			strcpy(organizer_string, "");
 		}
@@ -2220,7 +2220,7 @@ void ical_saving_vevent(icalcomponent *top_level_cal, icalcomponent *cal) {
 		}
 		if (!strncasecmp(organizer_string, "MAILTO:", 7)) {
 			strcpy(organizer_string, &organizer_string[7]);
-			striplt(organizer_string);
+			string_trim(organizer_string);
 			/*
 			 * If the user saving the event is listed as the
 			 * organizer, then send out invitations.
@@ -2490,7 +2490,7 @@ void ical_fixed_output_backend(icalcomponent *cal, int recursion_level) {
 
 			/* screen name or email address */
 			safestrncpy(buf, ch + 7, sizeof(buf));
-			striplt(buf);
+			string_trim(buf);
 			cprintf("%s ", buf);
 		}
 		cprintf("\n");
diff --git a/citadel/server/modules/ctdlproto/serv_user.c b/citadel/server/modules/ctdlproto/serv_user.c
index 9e438625c..3ee1e79bc 100644
--- a/citadel/server/modules/ctdlproto/serv_user.c
+++ b/citadel/server/modules/ctdlproto/serv_user.c
@@ -26,7 +26,7 @@ void cmd_user(char *cmdbuf) {
 	int a;
 
 	extract_token(username, cmdbuf, 0, '|', sizeof username);
-	striplt(username);
+	string_trim(username);
 	syslog(LOG_DEBUG, "user_ops: cmd_user(%s)", username);
 
 	a = CtdlLoginExistingUser(username);
@@ -486,7 +486,7 @@ void ListThisUser(char *username, void *data) {
 void cmd_list(char *cmdbuf) {
 	char searchstring[256];
 	extract_token(searchstring, cmdbuf, 0, '|', sizeof searchstring);
-	striplt(searchstring);
+	string_trim(searchstring);
 	cprintf("%d \n", LISTING_FOLLOWS);
 	ForEachUser(ListThisUser, (void *)searchstring );
 	cprintf("000\n");
diff --git a/citadel/server/modules/imap/imap_fetch.c b/citadel/server/modules/imap/imap_fetch.c
index f2d37b366..2ac8745c8 100644
--- a/citadel/server/modules/imap/imap_fetch.c
+++ b/citadel/server/modules/imap/imap_fetch.c
@@ -382,7 +382,7 @@ void imap_output_envelope_addr(char *addr) {
 	/* Output them one by one. */
 	for (i=0; i<num_addrs; ++i) {
 		extract_token(individual_addr, addr, i, ',', sizeof individual_addr);
-		striplt(individual_addr);
+		string_trim(individual_addr);
 		process_rfc822_addr(individual_addr, user, node, name);
 		IAPuts("(");
 		IPutStr(name, strlen(name));
diff --git a/citadel/server/modules/imap/imap_store.c b/citadel/server/modules/imap/imap_store.c
index 479a10486..bc235d752 100644
--- a/citadel/server/modules/imap/imap_store.c
+++ b/citadel/server/modules/imap/imap_store.c
@@ -116,7 +116,7 @@ void imap_do_store(citimap_command *Cmd) {
 		if (whichflags[strlen(whichflags)-1]==')') {
 			whichflags[strlen(whichflags)-1]=0;
 		}
-		striplt(whichflags);
+		string_trim(whichflags);
 
 		/* A client might twiddle more than one bit at a time.
 		 * Note that we check for the flag names without the leading
diff --git a/citadel/server/modules/inboxrules/serv_inboxrules.c b/citadel/server/modules/inboxrules/serv_inboxrules.c
index fb6bdd66e..1e1f8899a 100644
--- a/citadel/server/modules/inboxrules/serv_inboxrules.c
+++ b/citadel/server/modules/inboxrules/serv_inboxrules.c
@@ -206,7 +206,7 @@ struct inboxrules *deserialize_inbox_rules(char *serialized_rules) {
 			int t = 0;
 			for (t=0; t<nt; ++t) {
 				extract_token(rtoken, decoded_rule, t, '|', sizeof(rtoken));
-				striplt(rtoken);
+				string_trim(rtoken);
 				switch(t) {
 					case 1:								// field to compare
 						for (i=0; i<=field_all; ++i) {
diff --git a/citadel/server/modules/migrate/serv_migrate.c b/citadel/server/modules/migrate/serv_migrate.c
index a45cc017d..08568763f 100644
--- a/citadel/server/modules/migrate/serv_migrate.c
+++ b/citadel/server/modules/migrate/serv_migrate.c
@@ -935,7 +935,7 @@ int migr_restore_message_metadata(long msgnum, int refcount) {
 	if (mptr != NULL) {
 		char *aptr;
 		safestrncpy(smi.meta_content_type, &mptr[13], sizeof smi.meta_content_type);
-		striplt(smi.meta_content_type);
+		string_trim(smi.meta_content_type);
 		aptr = smi.meta_content_type;
 		while (!IsEmptyStr(aptr)) {
 			if ((*aptr == ';')
diff --git a/citadel/server/modules/pop3/serv_pop3.c b/citadel/server/modules/pop3/serv_pop3.c
index e6b018d5a..335968708 100644
--- a/citadel/server/modules/pop3/serv_pop3.c
+++ b/citadel/server/modules/pop3/serv_pop3.c
@@ -99,7 +99,7 @@ void pop3_user(char *argbuf) {
 	}
 
 	strcpy(username, argbuf);
-	striplt(username);
+	string_trim(username);
 
 	if (CtdlLoginExistingUser(username) == login_ok) {
 		cprintf("+OK Password required for %s\r\n", username);
@@ -186,7 +186,7 @@ void pop3_pass(char *argbuf) {
 	char password[SIZ];
 
 	safestrncpy(password, argbuf, sizeof password);
-	striplt(password);
+	string_trim(password);
 
 	if (CtdlTryPassword(password, strlen(password)) == pass_ok) {
 		pop3_login();
diff --git a/citadel/server/modules/rssclient/serv_rssclient.c b/citadel/server/modules/rssclient/serv_rssclient.c
index b1c42f292..8021ebdba 100644
--- a/citadel/server/modules/rssclient/serv_rssclient.c
+++ b/citadel/server/modules/rssclient/serv_rssclient.c
@@ -96,7 +96,7 @@ void rss_start_element(void *data, const char *el, const char **attribute) {
 					r->link = NULL;
 				}
 				r->link = strdup(attribute[i+1]);
-				striplt(r->link);
+				string_trim(r->link);
 			}
 		}
 	}
diff --git a/citadel/server/modules/vcard/serv_vcard.c b/citadel/server/modules/vcard/serv_vcard.c
index 9c9f98dd5..7dbeb4a91 100644
--- a/citadel/server/modules/vcard/serv_vcard.c
+++ b/citadel/server/modules/vcard/serv_vcard.c
@@ -95,7 +95,7 @@ void extract_inet_email_addrs(char *emailaddrbuf, size_t emailaddrbuf_len,
 		k = vcard_get_prop(v, "email", 1, instance, 1);
 		if ( (s != NULL) && (k != NULL) && (bmstrcasestr(k, "internet")) ) {
 			addr = strdup(s);
-			striplt(addr);
+			string_trim(addr);
 			if (!IsEmptyStr(addr)) {
 				IsDirectoryAddress = IsDirectory(addr, 1);
 
@@ -826,7 +826,7 @@ void dvca_mime_callback(char *name, char *filename, char *partnum, char *disp,
 		if (displayname[i] == ';') displayname[i] = ',';
 		if (displayname[i] == ',') has_commas = 1;
 	}
-	striplt(displayname);
+	string_trim(displayname);
 
 	cprintf("%s%s%s <%s>\n",
 		(has_commas ? "\"" : ""),
@@ -1112,7 +1112,7 @@ void store_this_ha(struct addresses_to_be_filed *aptr) {
 
 		/* Make a vCard out of each address */
 		extract_token(recipient, aptr->collected_addresses, i, ',', sizeof recipient);
-		striplt(recipient);
+		string_trim(recipient);
 		v = vcard_new_from_rfc822_addr(recipient);
 		if (v != NULL) {
 			const char *s;
diff --git a/citadel/server/modules/wiki/serv_wiki.c b/citadel/server/modules/wiki/serv_wiki.c
index 75238f852..d547d2157 100644
--- a/citadel/server/modules/wiki/serv_wiki.c
+++ b/citadel/server/modules/wiki/serv_wiki.c
@@ -257,7 +257,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 	do {
 		ptr = memreadline(ptr, buf, sizeof buf);
 		if (*ptr != 0) {
-			striplt(buf);
+			string_trim(buf);
 			if (!IsEmptyStr(buf) && (!strncasecmp(buf, "Content-type:", 13))) {
 				if (
 					(bmstrcasestr(buf, "multipart") != NULL)
@@ -446,7 +446,7 @@ void wiki_rev_callback(char *name, char *filename, char *partnum, char *disp,
 
 	CtdlDecodeBase64(memo, filename, strlen(filename));
 	extract_token(this_rev, memo, 0, '|', sizeof this_rev);
-	striplt(this_rev);
+	string_trim(this_rev);
 
 	/* Perform the patch */
 	fp = popen("patch -f -s -p0 -r /dev/null >/dev/null 2>/dev/null", "w");
@@ -580,7 +580,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 	memset(&hecbd, 0, sizeof(struct HistoryEraserCallBackData));
 	hecbd.tempfilename = temp;
 	hecbd.stop_when = rev;
-	striplt(hecbd.stop_when);
+	string_trim(hecbd.stop_when);
 
 	mime_parser(CM_RANGE(msg, eMesageText), *wiki_rev_callback, NULL, NULL, (void *)&hecbd, 0);
 	CM_Free(msg);
diff --git a/citadel/server/modules/xmpp/serv_xmpp.c b/citadel/server/modules/xmpp/serv_xmpp.c
index 1a0ec98c2..13e8c1764 100644
--- a/citadel/server/modules/xmpp/serv_xmpp.c
+++ b/citadel/server/modules/xmpp/serv_xmpp.c
@@ -311,21 +311,21 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
 	if (!strcasecmp(el, "resource")) {
 		if (XMPP->chardata_len > 0) {
 			safestrncpy(XMPP->iq_client_resource, XMPP->chardata, sizeof XMPP->iq_client_resource);
-			striplt(XMPP->iq_client_resource);
+			string_trim(XMPP->iq_client_resource);
 		}
 	}
 
 	else if (!strcasecmp(el, "username")) {		/* NON SASL ONLY */
 		if (XMPP->chardata_len > 0) {
 			safestrncpy(XMPP->iq_client_username, XMPP->chardata, sizeof XMPP->iq_client_username);
-			striplt(XMPP->iq_client_username);
+			string_trim(XMPP->iq_client_username);
 		}
 	}
 
 	else if (!strcasecmp(el, "password")) {		/* NON SASL ONLY */
 		if (XMPP->chardata_len > 0) {
 			safestrncpy(XMPP->iq_client_password, XMPP->chardata, sizeof XMPP->iq_client_password);
-			striplt(XMPP->iq_client_password);
+			string_trim(XMPP->iq_client_password);
 		}
 	}
 
diff --git a/citadel/server/modules/xmpp/xmpp_messages.c b/citadel/server/modules/xmpp/xmpp_messages.c
index 45e4822b0..219f8efdd 100644
--- a/citadel/server/modules/xmpp/xmpp_messages.c
+++ b/citadel/server/modules/xmpp/xmpp_messages.c
@@ -61,7 +61,7 @@ void xmpp_output_incoming_messages(void) {
 			xmlesc(xmlbuf2, ptr->sender_email, sizeof xmlbuf2)
 		);
 		if (ptr->text != NULL) {
-			striplt(ptr->text);
+			string_trim(ptr->text);
 			cprintf("<body>%s</body>", xmlesc(xmlbuf1, ptr->text, sizeof xmlbuf1));
 			free(ptr->text);
 		}
diff --git a/citadel/server/msgbase.c b/citadel/server/msgbase.c
index 4ddd9aa42..679390eea 100644
--- a/citadel/server/msgbase.c
+++ b/citadel/server/msgbase.c
@@ -2658,7 +2658,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 		if (mptr != NULL) {
 			char *aptr;
 			safestrncpy(content_type, &mptr[13], sizeof content_type);
-			striplt(content_type);
+			string_trim(content_type);
 			aptr = content_type;
 			while (!IsEmptyStr(aptr)) {
 				if ((*aptr == ';')
@@ -3128,8 +3128,8 @@ struct CtdlMessage *CtdlMakeMessageLen(
 	msg->cm_anon_type = type;
 	msg->cm_format_type = format_type;
 
-	if (recipient != NULL) rcplen = striplt(recipient);
-	if (recp_cc != NULL) cclen = striplt(recp_cc);
+	if (recipient != NULL) rcplen = string_trim(recipient);
+	if (recp_cc != NULL) cclen = string_trim(recp_cc);
 
 	/* Path or Return-Path */
 	if (myelen > 0) {
@@ -3178,7 +3178,7 @@ struct CtdlMessage *CtdlMakeMessageLen(
 
 	if (subject != NULL) {
 		long length;
-		length = striplt(subject);
+		length = string_trim(subject);
 		if (length > 0) {
 			long i;
 			long IsAscii;
diff --git a/citadel/server/user_ops.c b/citadel/server/user_ops.c
index 6617fabe9..62b11981c 100644
--- a/citadel/server/user_ops.c
+++ b/citadel/server/user_ops.c
@@ -478,7 +478,7 @@ int CtdlLoginExistingUser(const char *trythisname) {
 
 	// Continue attempting user validation...
 	safestrncpy(username, trythisname, sizeof (username));
-	striplt(username);
+	string_trim(username);
 
 	if (IsEmptyStr(username)) {
 		return login_not_found;
diff --git a/citadel/utils/citmail.c b/citadel/utils/citmail.c
index b611766e6..6686507ec 100644
--- a/citadel/utils/citmail.c
+++ b/citadel/utils/citmail.c
@@ -247,7 +247,7 @@ int main(int argc, char **argv) {
 				for (i=0; i<num_recp_on_this_line; ++i) {
 					extract_token(this_recp, add_these_recipients,
 						i, ',', sizeof this_recp);
-					striplt(this_recp);
+					string_trim(this_recp);
 					if (!IsEmptyStr(this_recp)) {
 						++num_recipients;
 						recipients = realloc(recipients,
diff --git a/libcitadel/lib/html_to_ascii.c b/libcitadel/lib/html_to_ascii.c
index 33373c19d..251f1adea 100644
--- a/libcitadel/lib/html_to_ascii.c
+++ b/libcitadel/lib/html_to_ascii.c
@@ -591,7 +591,7 @@ char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth, int ansi)
 	output_len += strlen(outbuf);
 
 	/* Strip leading/trailing whitespace.  We can't do this with
-	 * striplt() because it uses too many strlen()'s
+	 * string_trim() because it uses too many strlen()'s
 	 */
 	while ((output_len > 0) && (isspace(outptr[0]))) {
 		strcpy(outptr, &outptr[1]);
diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 4d83d8e79..37cd26b06 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -406,7 +406,7 @@ size_t CtdlDecodeBase64(char *dest, const char *source, size_t length);
 unsigned int decode_hex(char *Source);
 int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen);
 void StripSlashes(char *Dir, int TrailingSlash);
-size_t striplt(char *);
+size_t string_trim(char *);
 int haschar(const char *st, int ch);
 void remove_token(char *source, int parmnum, char separator);
 int is_msg_in_sequence_set(const char *mset, long msgnum);
@@ -430,7 +430,7 @@ void CtdlMakeTempFileName(char *name, int len);
 char *rfc2047encode(const char *line, long length);
 int is_msg_in_mset(const char *mset, long msgnum);
 int pattern2(char *search, char *patn);
-void stripltlen(char *, int *);
+void string_trimlen(char *, int *);
 char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth, int ansi);
 void LoadEntityList(char *FileName);
 void utf8ify_rfc822_string(char *buf);
diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index 318c23fde..d6ff049ed 100644
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -390,7 +390,7 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
 			if (!strncasecmp(header, "Content-type:", 13)) {
 				memcpy (m->b[content_type].Key, &header[13], headerlen - 12);
 				m->b[content_type].Key[headerlen - 12] = '\0';
-				m->b[content_type].len = striplt (m->b[content_type].Key);
+				m->b[content_type].len = string_trim (m->b[content_type].Key);
 
 				m->b[content_type_name].len = extract_key(m->b[content_type_name].Key, CKEY(m->b[content_type]), HKEY("name"), '=');
 				m->b[charset].len           = extract_key(m->b[charset].Key,           CKEY(m->b[content_type]), HKEY("charset"), '=');
@@ -411,18 +411,18 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
 			else if (!strncasecmp(header, "Content-Disposition:", 20)) {
 				memcpy (m->b[disposition].Key, &header[20], headerlen - 19);
 				m->b[disposition].Key[headerlen - 19] = '\0';
-				m->b[disposition].len = striplt(m->b[disposition].Key);
+				m->b[disposition].len = string_trim(m->b[disposition].Key);
 
 				m->b[content_disposition_name].len = extract_key(m->b[content_disposition_name].Key, CKEY(m->b[disposition]), HKEY("name"), '=');
 				m->b[filename].len                 = extract_key(m->b[filename].Key,                 CKEY(m->b[disposition]), HKEY("filename"), '=');
 				pch = strchr(m->b[disposition].Key, ';');
 				if (pch != NULL) *pch = '\0';
-				m->b[disposition].len = striplt(m->b[disposition].Key);
+				m->b[disposition].len = string_trim(m->b[disposition].Key);
 			}
 			else if (!strncasecmp(header, "Content-ID:", 11)) {
 				memcpy(m->b[id].Key, &header[11], headerlen - 11);
 				m->b[id].Key[headerlen - 11] = '\0';
-				striplt(m->b[id].Key);
+				string_trim(m->b[id].Key);
 				m->b[id].len = stripallbut(m->b[id].Key, '<', '>');
 			}
 			else if (!strncasecmp(header, "Content-length: ", 15)) {
@@ -435,7 +435,7 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
 			else if (!strncasecmp(header, "Content-transfer-encoding: ", 26)) {
 				memcpy(m->b[encoding].Key, &header[26], headerlen - 26);
 				m->b[encoding].Key[headerlen - 26] = '\0';
-				m->b[encoding].len = striplt(m->b[encoding].Key);
+				m->b[encoding].len = string_trim(m->b[encoding].Key);
 			}
 			*header = '\0';
 			headerlen = 0;
diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index 131cc2f7a..8971b30e6 100644
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -245,7 +245,7 @@ void StripSlashes(char *Dir, int TrailingSlash) {
 
 
 // Strip leading and trailing spaces from a string
-size_t striplt(char *buf) {
+size_t string_trim(char *buf) {
 	char *first_nonspace = NULL;
 	char *last_nonspace = NULL;
 	char *ptr;
@@ -849,7 +849,7 @@ int pattern2(char *search, char *patn) {
  * buf - the string to modify
  * len - length of the string. 
  */
-void stripltlen(char *buf, int *len) {
+void string_trimlen(char *buf, int *len) {
 	int delta = 0;
 	if (*len == 0) return;
 	while ((*len > delta) && (isspace(buf[delta]))){
diff --git a/libcitadel/lib/vcard.c b/libcitadel/lib/vcard.c
index f52bb29c4..b58f61c96 100644
--- a/libcitadel/lib/vcard.c
+++ b/libcitadel/lib/vcard.c
@@ -62,7 +62,7 @@ void remove_charset_attribute(char *strbuf)
 	t = num_tokens(strbuf, ';');
 	for (i=0; i<t; ++i) {
 		extract_token(compare, strbuf, i, ';', sizeof compare);
-		striplt(compare);
+		string_trim(compare);
 		if (!strncasecmp(compare, "charset=", 8)) {
 			remove_token(strbuf, i, ';');
 		}
@@ -387,7 +387,7 @@ void vcard_fn_to_n(char *vname, char *n, size_t vname_size) {
 
 	/* Anything left is probably the first name */
 	safestrncpy(firstname, buf, sizeof firstname);
-	striplt(firstname);
+	string_trim(firstname);
 
 	/* Compose the structured name */
 	snprintf(vname, vname_size, "%s;%s;%s;%s;%s", lastname, firstname, middlename,
diff --git a/textclient/routines.c b/textclient/routines.c
index 6ef297866..1dff2b7d1 100644
--- a/textclient/routines.c
+++ b/textclient/routines.c
@@ -81,7 +81,7 @@ void edit_user_internet_email_addresses(CtdlIPC * ipc, char *who) {
 		switch (ch) {
 		case 'a':
 			newprompt("Enter new email address: ", buf, 50);
-			striplt(buf);
+			string_trim(buf);
 			if (!IsEmptyStr(buf)) {
 				// FIXME validate the email address (format, our own domain, addr does not belong to another user)
 				++num_recs;
diff --git a/textclient/routines2.c b/textclient/routines2.c
index edf206dd1..ebabf6e3e 100644
--- a/textclient/routines2.c
+++ b/textclient/routines2.c
@@ -109,8 +109,8 @@ void entregis(CtdlIPC * ipc) {
 		if (r / 100 == 2) {
 			extract_token(diruser, buf, 0, '@', sizeof diruser);
 			extract_token(dirnode, buf, 1, '@', sizeof dirnode);
-			striplt(diruser);
-			striplt(dirnode);
+			string_trim(diruser);
+			string_trim(dirnode);
 			if ((strcasecmp(diruser, fullname))
 			    || (strcasecmp(dirnode, ipc->ServInfo.nodename))) {
 				scr_printf("\nYou can't use %s as your address.\n", tmpemail);
diff --git a/textclient/tuiconfig.c b/textclient/tuiconfig.c
index 209ff2463..aefae6aed 100644
--- a/textclient/tuiconfig.c
+++ b/textclient/tuiconfig.c
@@ -374,7 +374,7 @@ void do_internet_configuration(CtdlIPC * ipc) {
 		switch (ch) {
 		case 'a':
 			newprompt("Enter host name: ", buf, 50);
-			striplt(buf);
+			string_trim(buf);
 			if (!IsEmptyStr(buf)) {
 				++num_recs;
 				if (num_recs == 1) {
@@ -549,7 +549,7 @@ void network_config_management(CtdlIPC * ipc, char *entrytype, char *comment) {
 				if (buf[i] == '#')
 					buf[i] = 0;
 			}
-			striplt(buf);
+			string_trim(buf);
 			if (!IsEmptyStr(buf)) {
 				fprintf(changefp, "%s|%s\n", entrytype, buf);
 			}
diff --git a/webcit-ng/server/forum_view.c b/webcit-ng/server/forum_view.c
index 9fccab60f..ef16e4eeb 100644
--- a/webcit-ng/server/forum_view.c
+++ b/webcit-ng/server/forum_view.c
@@ -28,7 +28,7 @@ JsonValue *json_tokenize_recipients(const char *Key, long keylen, char *recp) {
 	int num_recp = num_tokens(recp, ',');
 	for (int i=0; i<num_recp; ++i) {
 		extract_token(tokbuf, recp, i, ',', sizeof(tokbuf));
-		striplt(tokbuf);
+		string_trim(tokbuf);
 		JsonArrayAppend(j, NewJsonPlainString(HKEY("r"), tokbuf, strlen(tokbuf)));
 	}
 	return(j);
@@ -96,11 +96,11 @@ void json_render_one_message(struct http_transaction *h, struct ctdlsession *c,
 			// rfc822 header parsing here
 			if (!strncasecmp(buf, "Content-transfer-encoding:", 26)) {
 				strcpy(content_transfer_encoding, &buf[26]);
-				striplt(content_transfer_encoding);
+				string_trim(content_transfer_encoding);
 			}
 			if (!strncasecmp(buf, "Content-type:", 13)) {
 				strcpy(content_type, &buf[13]);
-				striplt(content_type);
+				string_trim(content_type);
 			}
 		}
 		if (!strcmp(buf, "000")) {		// if we have an empty message, don't try to read further
diff --git a/webcit-ng/server/html2html.c b/webcit-ng/server/html2html.c
index b6dadc35e..ab37b7b08 100644
--- a/webcit-ng/server/html2html.c
+++ b/webcit-ng/server/html2html.c
@@ -52,7 +52,7 @@ void extract_charset_from_meta(char *charset, char *meta_http_equiv, char *meta_
 		return;
 
 	safestrncpy(buf, ++ptr, sizeof buf);
-	striplt(buf);
+	string_trim(buf);
 	if (!strncasecmp(buf, "charset=", 8)) {
 		strcpy(charset, &buf[8]);
 
@@ -68,7 +68,7 @@ void extract_charset_from_meta(char *charset, char *meta_http_equiv, char *meta_
 		// Remove wandering punctuation
 		if ((ptr = strchr(charset, '\"')))
 			*ptr = 0;
-		striplt(charset);
+		string_trim(charset);
 	}
 }
 
@@ -151,7 +151,7 @@ StrBuf *html2html(const char *supplied_charset, int treat_as_wiki, char *roomnam
 				meta = malloc(meta_length + 1);
 				safestrncpy(meta, meta_start, meta_length);
 				meta[meta_length] = 0;
-				striplt(meta);
+				string_trim(meta);
 				if (!strncasecmp(meta, "HTTP-EQUIV=", 11)) {
 					meta_http_equiv = strdup(&meta[11]);
 					spaceptr = strchr(meta_http_equiv, ' ');
diff --git a/webcit-ng/server/http.c b/webcit-ng/server/http.c
index 55c335eff..161c070f5 100644
--- a/webcit-ng/server/http.c
+++ b/webcit-ng/server/http.c
@@ -140,8 +140,8 @@ void perform_one_http_transaction(struct client_handle *ch) {
 				new_request_header.key = strdup(buf);
 				++c;
 				new_request_header.val = strdup(c);
-				striplt(new_request_header.key);
-				striplt(new_request_header.val);
+				string_trim(new_request_header.key);
+				string_trim(new_request_header.val);
 				array_append(h.request_headers, &new_request_header);
 #ifdef DEBUG_HTTP
 				syslog(LOG_DEBUG, "\033[1m\033[35m{ %s: %s\033[0m", new_request_header.key, new_request_header.val);
diff --git a/webcit-ng/server/messages.c b/webcit-ng/server/messages.c
index 1f28af8bb..a45337b89 100644
--- a/webcit-ng/server/messages.c
+++ b/webcit-ng/server/messages.c
@@ -77,7 +77,7 @@ void dav_get_message(struct http_transaction *h, struct ctdlsession *c, long msg
 			if (v) {
 				*v = 0;
 				++v;
-				striplt(v);	// we now have a key (k) and a value (v)
+				string_trim(v);	// we now have a key (k) and a value (v)
 				if ((!strcasecmp(k, "content-type"))	// fields which can be passed from RFC822 to HTTP as-is
 				    || (!strcasecmp(k, "date"))
 				) {
diff --git a/webcit-ng/server/room_functions.c b/webcit-ng/server/room_functions.c
index 67b3e9082..e18633a8b 100644
--- a/webcit-ng/server/room_functions.c
+++ b/webcit-ng/server/room_functions.c
@@ -52,14 +52,14 @@ int match_etags(char *taglist, long msgnum) {
 
 	for (i = 0; i < num_tags; ++i) {
 		extract_token(tag, taglist, i, ',', sizeof tag);
-		striplt(tag);
+		string_trim(tag);
 		char *lq = (strchr(tag, '"'));
 		char *rq = (strrchr(tag, '"'));
 		if (lq < rq) {					// has two double quotes
 			strcpy(rq, "");
 			strcpy(tag, ++lq);
 		}
-		striplt(tag);
+		string_trim(tag);
 		if (!strcmp(tag, "*")) {			// wildcard match
 			return (1);
 		}