Marged lint and automation fixes

.gitea/workflows/arch.yaml

@@ -3,14 +3,14 @@ run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀
 on: 
   - push
   - workflow_dispatch
-
+if: ${{ github.ref }} == 'refs/head/master'
 jobs:
   build-arch:
     runs-on: arch-latest
-    if: ${{ github.ref }} == 'refs/head/master' 
+
     branches:
       - 'master'
-      - 'zx'
+
     steps:
       - name: Checking environment
         continue-on-error: true
@@ -24,8 +24,8 @@ jobs:
         run: useradd -d /builder -g users -m builder
       - name: Downloading PKGBUILD
         run: |
-          su - builder -c "curl -O http://zxprj:3001/zx/bforce/raw/branch/${GITHUB_REF_NAME}/archlinux/bforce.install"
+          su - builder -c "curl -O http://zxprj:3001/zx/bforce/raw/branch/master/archlinux/bforce.install"
-          su - builder -c "curl -o PKGBUILD http://zxprj:3001/zx/bforce/raw/branch/${GITHUB_REF_NAME}/archlinux/PKGBUILD.ci"
+          su - builder -c "curl -o PKGBUILD http://zxprj:3001/zx/bforce/raw/branch/master/archlinux/PKGBUILD.ci"
       - name: Building archlinux package
         run: |
           su -w GITHUB_SHA,GITHUB_REF_NAME,GITHUB_REF_TYPE - builder -c makepkg
@@ -34,7 +34,7 @@ jobs:
         run: |
           echo "BFORCE_VER=$(cat /builder/src/bforce/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV
       - name: Retrieving artifact files
-        run: mkdir bforce && cp /builder/bforce-r*.pkg.tar.zst bforce
+        run: mkdir bforce && cp /builder/bforce-*.pkg.tar.zst bforce
       - name: Try to upload artifacts
         uses: actions/upload-artifact@v3
         with:

.gitea/workflows/debpkg.yaml

@@ -1,6 +1,8 @@
 name: Debian build
 run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀
-on: [push]
+on: 
+  - push
+  - workflow_dispatch
 jobs:
   build-ubuntu:
     runs-on: ubuntu-latest

README.md

@@ -1,4 +1,5 @@
-![zx branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/arch.yaml/badge.svg?branch=zx)
+![master branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/debpkg.yaml/badge.svg?branch=master)
+![master branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/arch.yaml/badge.svg?branch=master)
 
 BinkleyForce FTN mailer
 -----------------------
@@ -45,6 +46,10 @@ New Versions
 
     https://prj.zxalexis.ru/gitea/zx/bforce
 
+SAST Tools
+----------
+[PVS-Studio](https://pvs-studio.com/pvs-studio/?utm_source=website&utm_medium=github&utm_campaign=open_source) - static analyzer for C, C++, C#, and Java code.
+
 Older Sources
 -------------
     https://github.com/zotrix/binkleyforce/

archlinux/PKGBUILD.ci

@@ -6,7 +6,7 @@ arch=('i686' 'x86_64' 'aarch64')
 url="https://prj.zxalexis.ru/gitea/zx/bforce/"
 license=('GPL2')
 source=(
-    "${pkgname}::git+https://prj.zxalexis.ru/gitea/${GITHUB_REF_NAME}/bforce.git"
+    "${pkgname}::git+https://prj.zxalexis.ru/gitea/zx/bforce.git"
 )
 makedepends=('git' 'gcc' 'make' 'glibc')
 provides=('bforce')
@@ -25,7 +25,11 @@ prepare() {
 
 pkgver() {
     cd "$pkgname"
-    printf "r%s.%s.%s" "$(git rev-list --count ${GITHUB_SHA})" "$(git rev-parse --short ${GITHUB_SHA})" "${GITHUB_REF_NAME}"
+    if [ "${GITHUB_REF_TYPE}" = "tags" ]; then
+		printf "v%s" "${GITHUB_REF_NAME}"
+	else
+		printf "r%s.%s.%s" "$(git rev-list --count ${GITHUB_SHA})" "$(git rev-parse --short ${GITHUB_SHA})" "${GITHUB_REF_NAME}"
+	fi
 }
 
 package() {

source/bforce/expression.tab.c

@@ -950,7 +950,7 @@ int yydebug;
 `-----------------------------------------------*/
 
 static void
-yydestruct (const char *yymsg,
+yydestruct (char *yymsg,
             yysymbol_kind_t yykind, YYSTYPE *yyvaluep)
 {
   YY_USE (yyvaluep);
@@ -1059,6 +1059,7 @@ yysetstate:
         /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
            memory.  */
+        YYSTYPE *yyls1 = yyls;
         yy_state_t *yyss1 = yyss;
         YYSTYPE *yyvs1 = yyvs;
 
@@ -1069,7 +1070,9 @@ yysetstate:
         yyoverflow (YY_("memory exhausted"),
                     &yyss1, yysize * YYSIZEOF (*yyssp),
                     &yyvs1, yysize * YYSIZEOF (*yyvsp),
+                    &yyls1, yysize * YYSIZEOF (*yylsp),
                     &yystacksize);
+        yyls = yyls1;
         yyss = yyss1;
         yyvs = yyvs1;
       }

source/bforce/expression.y

@@ -360,7 +360,8 @@ static int expr_check_mailer(const char *str)
 
 static int expr_check_addr(const char *str)
 {
-	s_faddr addr;
+	s_faddr addr = { 0, 0, 0, 0, 0, '\0' };
+
 #ifdef DEBUG
 	char abuf1[BF_MAXADDRSTR+1];
 	char abuf2[BF_MAXADDRSTR+1];
@@ -368,6 +369,7 @@ static int expr_check_addr(const char *str)
 	DEB((D_EVENT, "[yacc] addr: \"%s\" (session with \"%s\")",
 		ftn_addrstr(abuf1, addr),
 		ftn_addrstr(abuf2, state.node.addr)));
+	
 #endif
 	
 	if( !state.valid )

source/bforce/logger.c

@@ -172,7 +172,7 @@ int log_reopen(const char *logname, const char *ext, const char *tty)
 }
 
 
-int log(const char *s, ...)
+void log(const char *s, ...)
 
 {
 	char timestr[40];
@@ -212,10 +212,10 @@ int log(const char *s, ...)
 	
 	va_end(args);
 
-	return 0;
+	//return 0;
 }
 
-int logerr(const char *s, ...)
+void logerr(const char *s, ...)
 {
 	char timestr[40];
 	va_list args;
@@ -281,7 +281,7 @@ int logerr(const char *s, ...)
 	
 	va_end(args);
 
-	return 0;
+	//return 0;
 }
 
 #endif /* USE_SYSLOG */
@@ -308,7 +308,7 @@ int log_open(const char *logname, const char *ext, const char *tty)
      p = xstrcat(p, BF_VERSION);
      int fac = conf_number(cf_syslog_facility);
      if( tty && *tty )
-                strncpy(p, tty, sizeof(p));
+                strncpy(p, tty, strlen(p));
      openlog(p, LOG_PID, fac);
      slog_active = TRUE;
      return 0;
@@ -330,7 +330,7 @@ int log_close(void)
      
 }
 
-int log(const char *s, ...)
+void log(const char *s, ...)
 
 {
 	char timestr[40];
@@ -357,10 +357,10 @@ int log(const char *s, ...)
 
 	va_end(args);
 
-	return 0;
+	//return 0;
 }
 
-int logerr(const char *s, ...)
+void logerr(const char *s, ...)
 
 {
 	char timestr[40];
@@ -379,7 +379,7 @@ int logerr(const char *s, ...)
 	
 	va_end(args);
 
-	return 0;
+//	return 0;
 }
 
 #endif /* USE_SYSLOG */
@@ -530,7 +530,7 @@ int debug_close(void)
 	return rc;
 }
 
-int debug(unsigned long what, const char *str, ...)
+void debug(unsigned long what, const char *str, ...)
 {
 	char buf[40];
 	va_list args;
@@ -554,7 +554,7 @@ int debug(unsigned long what, const char *str, ...)
 		}
 	}
 	
-	return 0;
+	//return 0;
 }
 
 #endif /* DEBUG */

source/bforce/os_unix.c

@@ -152,6 +152,7 @@ int exec_redirect_descriptor(int desc, const char *fname, int flags)
 	{
 		log("exec error: cannot open \"%s\" <--> %d (got %d)",
 				fname, desc, fd);
+		close(fd);
 		return -1;
 	}
 
@@ -329,7 +330,8 @@ int xsystem(const char *command, const char *p_input, const char *p_output)
 {
 	pid_t pid;
 	int status;
-
+	int fd;
+	
 	ASSERT(command != NULL);
 	
 	DEB((D_INFO, "xsystem: command \"%s\", input \"%s\", output \"%s\"",
@@ -342,27 +344,33 @@ int xsystem(const char *command, const char *p_input, const char *p_output)
 		if( p_input )
 		{
 			close(0);
-			if( open(p_input, O_RDONLY) != 0 )
+			fd = open(p_input, O_RDONLY);
+			if( fd != 0 )
 			{
 				logerr("can't open stdin \"%s\"", p_input);
+				close(fd);
 				exit(-1);
 			}
 		}
 		if( p_output )
 		{
 			close(1);
-			if( open(p_output, O_WRONLY|O_APPEND|O_CREAT, 0600) != 1 )
+			fd = open(p_output, O_WRONLY|O_APPEND|O_CREAT, 0600);
+			if( fd != 1 )
 			{
 				logerr("can't open stdout \"%s\"", p_output);
+				close(fd);
 				exit(-1);
 			}
 		}
 		if( p_output )
 		{
 			close(2);
-			if( open(p_output, O_WRONLY|O_APPEND|O_CREAT, 0600) != 2 )
+			fd = open(p_output, O_WRONLY|O_APPEND|O_CREAT, 0600);
+			if( fd != 2 )
 			{
 				logerr("can't open stderr \"%s\"", p_output);
+				close(fd);
 				exit(-1);
 			}
 		}

source/include/logger.h

@@ -65,8 +65,8 @@ void log_setident(const char *ident);
 int  log_open(const char *logname, const char *ext, const char *tty);
 int  log_close(void);
 int  log_reopen(const char *logname, const char *ext, const char *tty);
-int  log(const char *s, ...);
+void log(const char *s, ...);
-int  logerr(const char *s, ...);
+void  logerr(const char *s, ...);
 
 #ifdef DEBUG
 //void debug_setlevel(long newlevel, bool logit);
@@ -75,7 +75,7 @@ bool debug_isopened(void);
 //int  debug_parsestring(char *str, unsigned long *deblevel);
 int debug_open();
 int debug_close();
-int debug(unsigned long what, const char *str, ...);
+void debug(unsigned long what, const char *str, ...);
 void debug_configure();
 #endif
 

source/include/version.h

@@ -21,7 +21,7 @@
 #define BF_VERSION    RELEASE_VERSION
 #define BF_CDATE      __DATE__ __TIME__
 #define BF_REG        "free software"
-#define BF_COPYRIGHT  "(c) 1997-2000 by Alexander Belkin"
+#define BF_COPYRIGHT  "(c) 1997-2000 by Alexander Belkin, 2004-2025 fidonet members"
 
 #define BF_BANNERVER  BF_NAME" "BF_VERSION"/"BF_OS