Merge branch 'master' of ssh://git.code.sf.net/p/mbsebbs/code

Syncing Hg and Git repositories.

lib/clcomm.c

@@ -619,7 +619,7 @@ char *printable(char *s, int l)
 		case '\b': *p++='\\'; *p++='b'; break;
 		default:   snprintf(p, 5, "\\%02x", (*s & 0xff)); p+=3; break;
 	    }
-	    s++;
+	s++;
     }
     *p='\0';
     return pbuff;

lib/ftn.c

@@ -594,7 +594,7 @@ fidoaddr *faddr2fido(faddr *aka)
 	fidoaddr *Sys;
 
 	Sys = (fidoaddr *)malloc(sizeof(fidoaddr));
-	memset(Sys, 0, sizeof(Sys));
+	memset(Sys, 0, sizeof(*Sys));
 	Sys->zone  = aka->zone;
 	Sys->net   = aka->net;
 	Sys->node  = aka->node;

lib/mbdiesel.c

@@ -245,7 +245,7 @@ void html_massage(char *inbuf, char *outbuf, size_t size)
         char    *inptr = inbuf;
         char    *outptr = outbuf;
 
-        memset(outbuf, 0, sizeof(outbuf));
+        memset(outbuf, 0, sizeof(*outbuf));
 
         while (*inptr) {
 

lib/mbselib.h

@@ -1274,6 +1274,7 @@ struct	sysconfig {
 	unsigned	ca_Notify	: 1;	/* Areamgr: Notify on/off   */
 	unsigned	ca_Passwd	: 1;	/* Areamgr: Passwd change   */
 	unsigned	ca_Pause	: 1;	/* Areamgr: Allow Pause     */
+	unsigned	ca_SBstrip	: 1;    /* Strip SB out-of-zone     */
 	unsigned	ca_Check	: 1;	/* Flag for upgrade check   */
 
 	char		rulesdir[65];		/* Area rules directory	    */

lib/msg.c

@@ -518,8 +518,8 @@ char *Fgets(char *l, int size, FILE *f) {
       eol = TRUE;
       break;
     } else
-	 cr = (c=='\r');
-	 if ( cr )
+      cr = (c=='\r');
+    if ( cr )
       continue;
     --size;
     if (c=='\n') { eol = TRUE; break; }

lib/nodelist.c

@@ -862,7 +862,7 @@ node *getnlent(faddr *addr)
 		     * Parse the IP flag for a optional port number.
 		     */
 		    if ((r = strrchr(p, ':'))) {
-			*r++;
+			r++;
 			for (tmps = &nl_service; *tmps; tmps=&((*tmps)->next)) {
 			    if (strncmp(p, (*tmps)->flag, 3) == 0) {
 				/*

lib/rearc.c

@@ -88,7 +88,7 @@ int rearc(char *filename, char *arctype, int do_quiet)
     newname = calloc(PATH_MAX, sizeof(char));
     strcpy(newname, filename);
     p = strrchr(newname, '.');
-    *p++;
+    p++;
     *p = '\0';
 
     if (!getarchiver(arctype)) {

lib/virscan.c

@@ -161,7 +161,7 @@ int clam_stream_check(char *servname, char *servport, char *filename)
     /*  fwrite(buf, 1, buf_len, stderr); */
     buf_c = buf + buf_len;
     while(*buf_c=='\r' || *buf_c == '\r' || *buf_c == ' ')
-	*buf_c --;
+	buf_c --;
     if (buf_c - buf >= sizeof(" FOUND") && strncasecmp(buf_c - sizeof(" FOUND"), " FOUND", sizeof(" FOUND")-1) == 0) {
 	char *buf_s = buf;
 	buf_c -= sizeof(" FOUND");