backend update to 24.10.000.073

Author: agnitas-wkn

backend/build-backend.py

@@ -37,7 +37,6 @@
 
 lib:
 	src/script/data/bav.rc
-	src/script/data/bav.rule
 
 scripts mode=0755:
 	src/script/tools/activator3.py
@@ -50,6 +49,8 @@
 	src/script/tools/service3.py
 	src/script/tools/service3.cfg		mode=0644
 	src/script/lib/cq.rc			mode=0644
+	src/script/lib/requirements.py
+	src/script/lib/requirements.txt		mode=0644
 	
 scripts/agn3:
 	src/script/lib/agn3/*.*
@@ -66,9 +67,6 @@
 	
 scripts/once/tags:
 	lib/tags/*.lua
-
-scripts/requirements:
-	src/script/lib/requirements.txt		mode=0644
 """
 
 def toint (s: Any) -> int:
@@ -162,7 +160,7 @@ def create_package (self) -> None:
 				tf.addfile (ti)
 			#
 			# on-the-fly created file
-			build_spec = f'{self.version};{datetime.fromtimestamp (now):%Y-%m-%d %H:%M:%S};openemm.org;openemm'.encode ('UTF-8')
+			build_spec = f'{self.version};{datetime.fromtimestamp (now):%Y-%m-%d %H:%M:%S};openemm.org;openemm;openemm'.encode ('UTF-8')
 			ti = tarfile.TarInfo (os.path.join (self.directory, 'scripts', 'build.spec'))
 			ti.size = len (build_spec)
 			ti.mtime = now

backend/src/c/lib/agn.h

@@ -348,6 +348,7 @@ typedef struct { /*{{{*/
 	const char	*timestamp;
 	const char	*host;
 	const char	*user;
+	const char	*typ;
 	/*}}}*/
 }	build_t;
 
@@ -409,6 +410,7 @@ extern void		buffer_ltrim (buffer_t *b);
 extern void		buffer_rtrim (buffer_t *b);
 extern void		buffer_trim (buffer_t *b);
 extern void		buffer_universal_newline (buffer_t *b, int start);
+extern bool_t		buffer_universal_crlf (buffer_t *b, int start);
 
 extern pool_t		*pool_alloc (void);
 extern pool_t		*pool_free (pool_t *p);

backend/src/c/lib/buffer.c

@@ -823,6 +823,49 @@ buffer_universal_newline (buffer_t *b, int start) /*{{{*/
 	if (src != dst)
 		b -> length -= src - dst;
 }/*}}}*/
+bool_t
+buffer_universal_crlf (buffer_t *b, int start) /*{{{*/
+{
+	bool_t		ok;
+	buffer_t	*scratch;
+	
+	ok = true;
+	if (start < buffer_length (b))
+		if (scratch = buffer_alloc (buffer_length (b) + 128)) {
+			int	pending;
+			int	n;
+			byte_t	*src;
+			bool_t	modified;
+		
+			modified = false;
+			for (n = pending = start, src = b -> buffer + start; ok && (n < b -> length); )
+				if (*src == '\r') {
+					++n, ++src;
+					if ((n < b -> length) && (*src == '\n'))
+						++n, ++src;
+				} else {
+					if (*src == '\n') {
+						if (pending < n)
+							ok = buffer_stiff (scratch, b -> buffer + pending, n - pending);
+						pending = n + 1;
+						if (ok && (ok = buffer_stiffsn (scratch, "\r\n", 2)))
+							modified = true;
+					}
+					++n, ++src;
+				}
+			if (ok && modified) {
+				if (pending < n)
+					ok = buffer_stiff (scratch, b -> buffer + pending, n - pending);
+				if (ok) {
+					buffer_truncate (b, start);
+					ok = buffer_appendbuf (b, scratch);
+				}
+			}
+			buffer_free (scratch);
+		} else
+			ok = false;
+	return ok;
+}/*}}}*/
 
 struct pool { /*{{{*/
 	buffer_t	*root;

backend/src/c/lib/build.c

@@ -37,7 +37,7 @@ build_alloc (void) /*{{{*/
 						while ((n > 0) && strchr (" \t\r\n\v", (b -> version[n - 1])))
 							--n;
 						b -> version[n] = '\0';
-						b -> timestamp = b -> host = b -> user = b -> version + n;
+						b -> timestamp = b -> host = b -> user = b -> typ = b -> version + n;
 						if (ptr = strchr (b -> version, ';')) {
 							*ptr++ = '\0';
 							b -> timestamp = ptr;
@@ -47,6 +47,12 @@ build_alloc (void) /*{{{*/
 								if (ptr = strchr (ptr, ';')) {
 									*ptr++ = '\0';
 									b -> user = ptr;
+									if (ptr = strchr (ptr, ';')) {
+										*ptr++ = '\0';
+										b -> typ = ptr;
+										if (ptr = strchr (ptr, ';'))
+											*ptr = '\0';
+									}
 								}
 							}
 						}

backend/src/c/lib/fsdb.c

@@ -252,7 +252,7 @@ fsdb_remove (fsdb_t *f, const char *key) /*{{{*/
 			if (errno == ENOENT)
 				return true;
 		} else if (S_ISREG (st.st_mode) && (unlink (f -> path) != -1))
-				return true;
+			return true;
 	}
 	return false;
 }/*}}}*/

backend/src/c/lib/systemconfig.c

@@ -390,6 +390,7 @@ config_extra (systemconfig_t *c) /*{{{*/
 	config_add (c, "build.timestamp", build && build -> timestamp ? build -> timestamp : "unknown");
 	config_add (c, "build.host", build && build -> host ? build -> host : "unknown");
 	config_add (c, "build.user", build && build -> user ? build -> user : "unknwon");
+	config_add (c, "build.typ", build && build -> typ ? build -> typ : "classic");
 	if (build)
 		build_free (build);
 	if ((fd = open (PATH_OSRELEASE, O_RDONLY)) != -1) {

backend/src/c/tools/cquery.c

@@ -55,6 +55,7 @@ execute_script (const char *filename, const char *script, char **argv, int argc)
 	if (! rc) {
 		lua_State	*lua;
 		int		n;
+		const char	*ptr;
 		char		*path;
 
 		if (! (lua = alua_alloc (Worthy))) {
@@ -67,12 +68,15 @@ execute_script (const char *filename, const char *script, char **argv, int argc)
 				lua_seti (lua, -2, n + 1);
 			}
 			lua_setglobal (lua, "argv");
-			for (n = 0; n < 2; ++n) {
+			for (n = 0; n < 3; ++n) {
 				switch (n) {
 				case 0:
-					path = mkpath (path_home (), ".cqrc", NULL);
+					path = (ptr = getenv ("CQRC")) ? strdup (ptr) : NULL;
 					break;
 				case 1:
+					path = mkpath (path_home (), ".cqrc", NULL);
+					break;
+				case 2:
 					path = mkpath (path_home (), "scripts", "cq.rc", NULL);
 					break;
 				default:

backend/src/c/xmlback/block.c

@@ -83,6 +83,7 @@ block_alloc (void) /*{{{*/
 		b -> bout = NULL;
 		DO_ZERO (b, tagpos);
 		b -> inuse = false;
+		b -> dvalue = 0;
 	}
 	return b;
 }/*}}}*/

backend/src/c/xmlback/blockmail.c

@@ -175,7 +175,8 @@ blockmail_alloc (const char *fname, bool_t syncfile, log_t *lg) /*{{{*/
 
 		b -> ltag = NULL;
 		b -> taglist_count = 0;
-		b -> clear_empty_dyn_block = false;
+		b -> clear_empty_dyn_block = true;
+		b -> clear_empty_dyn_block_without_dvalue = true;
 
 		b -> gtag = NULL;
 		b -> globaltag_count = 0;
@@ -193,6 +194,8 @@ blockmail_alloc (const char *fname, bool_t syncfile, log_t *lg) /*{{{*/
 		DO_ZERO (b, url);
 		DO_ZERO (b, link_resolve);
 
+		b -> virtuals = NULL;
+		
 		DO_ZERO (b, field);
 		b -> mailtype_index = -1;
 
@@ -211,8 +214,6 @@ blockmail_alloc (const char *fname, bool_t syncfile, log_t *lg) /*{{{*/
 		b -> spf = NULL;
 		b -> vip = NULL;
 		b -> onepix_template = NULL;
-		b -> offline_picture_prefix = NULL;
-		b -> opp_len = 0;
 		b -> force_ecs_uid = false;
 		b -> uid_version = 0;
 
@@ -337,6 +338,8 @@ blockmail_free (blockmail_t *b) /*{{{*/
 
 		DO_FREE (b, url);
 		DO_FREE (b, link_resolve);
+		if (b -> virtuals)
+			var_free_all (b -> virtuals);
 		DO_FREE (b, field);
 		if (b -> target_groups)
 			free (b -> target_groups);
@@ -352,8 +355,6 @@ blockmail_free (blockmail_t *b) /*{{{*/
 			xmlBufferFree (b -> vip);
 		if (b -> onepix_template)
 			xmlBufferFree (b -> onepix_template);
-		if (b -> offline_picture_prefix)
-			free (b -> offline_picture_prefix);
 		free (b);
 	}
 	return NULL;
@@ -752,6 +753,8 @@ blockmail_setup_tagpositions (blockmail_t *b) /*{{{*/
 
 	if (tmp = company_info_find (b, "clear-empty-dyn-block"))
 		b -> clear_empty_dyn_block = atob (tmp -> val);
+	if (tmp = company_info_find (b, "clear-empty-dyn-block-enhanced"))
+		b -> clear_empty_dyn_block_without_dvalue = atob (tmp -> val);
 	if (b -> ltag) {
 		int	n, m;
 		dyn_t	*d, *dd;
@@ -766,22 +769,6 @@ blockmail_setup_tagpositions (blockmail_t *b) /*{{{*/
 	}
 }/*}}}*/
 void
-blockmail_setup_offline_picture_prefix (blockmail_t *b) /*{{{*/
-{
-	var_t	*tmp;
-	
-	if (tmp = company_info_find (b, "offline-picture-prefix")) {
-		if (b -> offline_picture_prefix) {
-			free (b -> offline_picture_prefix);
-			b -> offline_picture_prefix = NULL;
-		}
-		if (tmp -> val && (b -> offline_picture_prefix = strdup (tmp -> val)))
-			b -> opp_len = strlen (b -> offline_picture_prefix);
-		else
-			b -> opp_len = 0;
-	}
-}/*}}}*/
-void
 blockmail_setup_auto_url_prefix (blockmail_t *b, const char *nprefix) /*{{{*/
 {
 	if (b -> auto_url_prefix)

backend/src/c/xmlback/blockspec.c

@@ -22,8 +22,6 @@ blockspec_alloc (void) /*{{{*/
 		b -> prefix = fix_alloc ();
 		DO_ZERO (b, postfix);
 		b -> linelength = 0;
-		b -> linesep = NULL;
-		b -> seplength = 0;
 		b -> opl = Add_None;
 		b -> clearance = false;
 		if (! b -> prefix)
@@ -38,65 +36,7 @@ blockspec_free (blockspec_t *b) /*{{{*/
 		if (b -> prefix)
 			fix_free (b -> prefix);
 		DO_FREE (b, postfix);
-		if (b -> linesep)
-			free (b -> linesep);
 		free (b);
 	}
 	return NULL;
 }/*}}}*/
-bool_t
-blockspec_set_lineseparator (blockspec_t *b, const xmlChar *sep, int slen) /*{{{*/
-{
-	bool_t	rc;
-	
-	rc = true;
-	if (! sep) {
-		if (b -> linesep) {
-			free (b -> linesep);
-			b -> linesep = NULL;
-		}
-		b -> seplength = 0;
-	} else if (b -> linesep = (b -> linesep ? realloc (b -> linesep, slen) : malloc (slen))) {
-		memcpy (b -> linesep, sep, slen);
-		b -> seplength = slen;
-	} else
-		rc = false;
-	return rc;
-}/*}}}*/
-bool_t
-blockspec_find_lineseparator (blockspec_t *b) /*{{{*/
-{
-	const xmlChar	*sep;
-	int		slen;
-	int		len;
-	const xmlChar	*cont;
-	int		n;
-
-	sep = NULL;
-	slen = 0;
-	if (b -> block && b -> block -> content) {
-		len = xmlBufferLength (b -> block -> content);
-		cont = xmlBufferContent (b -> block -> content);
-		for (n = 0; n < len; )
-			if ((cont[n] == '\r') || (cont[n] == '\n')) {
-				sep = cont + n;
-				slen = 1;
-				++n;
-				if (n < len)
-					if (sep[0] == '\r') {
-						if (cont[n] == '\n')
-							slen++;
-					} else if (sep[0] == '\n') {
-						if (cont[n] == '\r')
-							slen++;
-					}
-				break;
-			} else
-				n += xmlCharLength (cont[n]);
-		if (! sep) {
-			sep = char2xml ("\r\n");
-			slen = 2;
-		}
-	}
-	return blockspec_set_lineseparator (b, sep, slen);
-}/*}}}*/