From: Robert Pengelly <robertapengelly@hotmail.com>
Date: Fri, 14 Mar 2025 18:02:49 +0000 (+0000)
Subject: Switch to memmove instead of sprintf
X-Git-Url: https://git.candlhat.org/?a=commitdiff_plain;h=a4deeca26bd45e15f88f718a193fcb7e2b433919;p=sasm.git

Switch to memmove instead of sprintf
---

diff --git a/Makefile.unix b/Makefile.unix
index 94b0919..35cd617 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -1,13 +1,11 @@
 #******************************************************************************
 # @file             Makefile.unix
 #******************************************************************************
-OBJDIR              ?=  $(CURDIR)
 SRCDIR              ?=  $(CURDIR)
-
 VPATH               :=  $(SRCDIR)
 
 CC                  :=  gcc
-CFLAGS              :=  -D_FILE_OFFSET_BITS=64 -I$(OBJDIR) -I$(SRCDIR)/include -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90
+CFLAGS              :=  -D_FILE_OFFSET_BITS=64 -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90
 
 CSRC                :=  as.c bin.c cstr.c elks.c eval.c expr.c fixup.c frag.c hashtab.c intel.c kwd.c lex.c lib.c list.c listing.c ll.c macro.c process.c report.c section.c symbol.c vector.c
 
diff --git a/Makefile.w32 b/Makefile.w32
index b3fc631..533c7f0 100644
--- a/Makefile.w32
+++ b/Makefile.w32
@@ -1,13 +1,11 @@
 #******************************************************************************
 # @file             Makefile.w32
 #******************************************************************************
-OBJDIR              ?=  $(CURDIR)
 SRCDIR              ?=  $(CURDIR)
-
 VPATH               :=  $(SRCDIR)
 
 CC                  :=  gcc
-CFLAGS              :=  -D_FILE_OFFSET_BITS=64 -I$(OBJDIR) -I$(SRCDIR)/include -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90
+CFLAGS              :=  -D_FILE_OFFSET_BITS=64 -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90
 
 CSRC                :=  as.c bin.c cstr.c elks.c eval.c expr.c fixup.c frag.c hashtab.c intel.c kwd.c lex.c lib.c list.c listing.c ll.c macro.c process.c report.c section.c symbol.c vector.c
 
diff --git a/eval.c b/eval.c
index f0fd20e..7e4e0d9 100644
--- a/eval.c
+++ b/eval.c
@@ -268,7 +268,8 @@ static unsigned int eval_unary (unsigned int lhs, char *start, char **pp) {
             (*pp)++;
         }
         
-        sprintf (caret, "%.*s", (int) (*pp - caret - 1), caret + 1);
+        memmove (caret, caret + 1, (*pp - caret) - 1);
+        *(caret + ((*pp - caret) - 1)) = '\0';
         
         lhs = eval_unary (lhs, start, &caret);
         lhs = eval_expr (lhs, start, &caret, 15);