Merge branch 'master' into develop

src/comm.cpp

@@ -1515,6 +1515,14 @@ Object *Comm::user()
 	    obj : (Object *) NULL;
 }
 
+/*
+ * return the number of connections
+ */
+eindex Comm::numUsers()
+{
+    return nusers;
+}
+
 /*
  * return an array with all user objects
  */

src/comm.h

@@ -1,7 +1,7 @@
 /*
  * This file is part of DGD, https://github.com/dworkin/dgd
  * Copyright (C) 1993-2010 Dworkin B.V.
- * Copyright (C) 2010-2022 DGD Authors (see the commit log for details)
+ * Copyright (C) 2010-2024 DGD Authors (see the commit log for details)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -90,6 +90,7 @@ class Comm {
     static void connect(Frame *f, Object *obj, char *addr, unsigned short port);
     static void connectDgram(Frame *f, Object *obj, int uport, char *addr,
 			     unsigned short port);
+    static eindex numUsers();
     static Array *listUsers(Dataspace*);
     static bool isConnection(Object*);
     static bool save(int);

src/config.cpp

@@ -727,6 +727,41 @@ Uint Config::dconv(char *buf, char *rbuf, const char *layout, Uint n)
 	    case 'e':
 		i = ALGN(i, ealign);
 		ri = ALGN(ri, realign);
+		if (sizeof(eindex) == resize) {
+		    switch (sizeof(eindex)) {
+		    case sizeof(char):
+			buf[i] = rbuf[ri];
+			break;
+
+		    case sizeof(short):
+			buf[i + header.s[0]] = rbuf[ri + rheader.s[0]];
+			buf[i + header.s[1]] = rbuf[ri + rheader.s[1]];
+			break;
+
+		    case sizeof(Int):
+			buf[i + header.i[0]] = rbuf[ri + rheader.i[0]];
+			buf[i + header.i[1]] = rbuf[ri + rheader.i[1]];
+			buf[i + header.i[2]] = rbuf[ri + rheader.i[2]];
+			buf[i + header.i[3]] = rbuf[ri + rheader.i[3]];
+			break;
+		    }
+		} else if (sizeof(eindex) == sizeof(short)) {
+		    buf[i + header.s[0]] = (UCHAR(rbuf[ri]) == 0xff) ? -1 : 0;
+		    buf[i + header.s[1]] = rbuf[ri];
+		} else if (resize == sizeof(char)) {
+		    j = (UCHAR(rbuf[ri]) == 0xff) ? -1 : 0;
+		    buf[i + header.i[0]] = j;
+		    buf[i + header.i[1]] = j;
+		    buf[i + header.i[2]] = j;
+		    buf[i + header.i[3]] = rbuf[ri];
+		} else {
+		    j = (UCHAR(rbuf[ri + rheader.s[0]] &
+			 rbuf[ri + rheader.s[1]]) == 0xff) ? -1 : 0;
+		    buf[i + header.i[0]] = j;
+		    buf[i + header.i[1]] = j;
+		    buf[i + header.i[2]] = rbuf[ri + rheader.s[0]];
+		    buf[i + header.i[3]] = rbuf[ri + rheader.s[1]];
+		}
 		i += sizeof(eindex);
 		ri += resize;
 		break;
@@ -1292,6 +1327,7 @@ bool Config::includes()
     puts("# define ST_DATAGRAMPORTS 24\t/* datagram ports */\012");
     puts("# define ST_TELNETPORTS\t25\t/* telnet ports */\012");
     puts("# define ST_BINARYPORTS\t26\t/* binary ports */\012");
+    puts("# define ST_NUSERS\t27\t/* # users */\012");
 
     puts("\012# define O_COMPILETIME\t0\t/* time of compilation */\012");
     puts("# define O_PROGSIZE\t1\t/* program size of object */\012");
@@ -1952,6 +1988,10 @@ bool Config::statusi(Frame *f, LPCint idx, Value *v)
 	}
 	break;
 
+    case 27:	/* ST_NUSERS */
+	PUT_INTVAL(v, Comm::numUsers());
+	break;
+
     default:
 	return FALSE;
     }
@@ -1970,8 +2010,8 @@ Array *Config::status(Frame *f)
 
     try {
 	EC->push();
-	a = Array::createNil(f->data, 27);
-	for (i = 0, v = a->elts; i < 27; i++, v++) {
+	a = Array::createNil(f->data, 28);
+	for (i = 0, v = a->elts; i < 28; i++, v++) {
 	    statusi(f, i, v);
 	}
 	EC->pop();

src/interpret.cpp

@@ -1459,7 +1459,7 @@ unsigned short Frame::switchInt(char *pc)
 	while (l < h) {
 	    m = (l + h) >> 1;
 	    p = pc + 4 * m;
-	    FETCH2S(p, num);
+	    num = FETCH2S(p, num);
 	    if (sp->number == num) {
 		return FETCH2U(p, l);
 	    } else if (sp->number < num) {
@@ -1589,12 +1589,10 @@ unsigned short Frame::switchRange(char *pc)
 	while (l < h) {
 	    m = (l + h) >> 1;
 	    p = pc + 4 * m;
-	    num = FETCH1S(p);
-	    if (sp->number < num) {
+	    if (sp->number < FETCH1S(p)) {
 		h = m;	/* search in lower half */
 	    } else {
-		num = FETCH1S(p);
-		if (sp->number <= num) {
+		if (sp->number <= FETCH1S(p)) {
 		    return FETCH2U(p, l);
 		}
 		l = m + 1;	/* search in upper half */
@@ -1606,12 +1604,10 @@ unsigned short Frame::switchRange(char *pc)
 	while (l < h) {
 	    m = (l + h) >> 1;
 	    p = pc + 6 * m;
-	    FETCH2S(p, num);
-	    if (sp->number < num) {
+	    if (sp->number < FETCH2S(p, num)) {
 		h = m;	/* search in lower half */
 	    } else {
-		FETCH2S(p, num);
-		if (sp->number <= num) {
+		if (sp->number <= FETCH2S(p, num)) {
 		    return FETCH2U(p, l);
 		}
 		l = m + 1;	/* search in upper half */

src/version.h

@@ -17,4 +17,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-# define VERSION	"DGD 1.7.4"
+# define VERSION	"DGD 1.7.5"