From 55cd705d8a66ba4982547be9edde31b49d5989dd Mon Sep 17 00:00:00 2001 From: Jimmy Olgeni Date: Wed, 21 Nov 2012 21:09:54 +0000 Subject: Upgrade to version 10.4.5. Feature safe: yes --- lang/newlisp/files/patch-newlisp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lang/newlisp/files/patch-newlisp.c') diff --git a/lang/newlisp/files/patch-newlisp.c b/lang/newlisp/files/patch-newlisp.c index 3cee50e3bb20..5d32fb2b4b0a 100644 --- a/lang/newlisp/files/patch-newlisp.c +++ b/lang/newlisp/files/patch-newlisp.c @@ -3,12 +3,12 @@ $FreeBSD$ --- newlisp.c.orig +++ newlisp.c -@@ -470,16 +470,16 @@ +@@ -463,16 +463,16 @@ + else if(getenv("DOCUMENT_ROOT")) strncpy(initFile, getenv("DOCUMENT_ROOT"), MAX_LINE - 16); - /* for non BSDs strlcat and strlcpy are redefined as strncat and strncpy */ -- strlcat(initFile, "/.", 3); -- strlcat(initFile, INIT_FILE, 9); +- strncat(initFile, "/.", 2); +- strncat(initFile, INIT_FILE, 9); + strlcat(initFile, "/.", sizeof(initFile)); + strlcat(initFile, INIT_FILE, sizeof(initFile)); if(loadFile(initFile, 0, 0, mainContext) == NULL) @@ -16,9 +16,9 @@ $FreeBSD$ envPtr = getenv("NEWLISPDIR"); if(envPtr) { -- strlcpy(initFile, envPtr, MAX_LINE - 16); -- strlcat(initFile, "/", 2); -- strlcat(initFile, INIT_FILE, 9); +- strncpy(initFile, envPtr, MAX_LINE - 16); +- strncat(initFile, "/", 1); +- strncat(initFile, INIT_FILE, 9); + strlcpy(initFile, envPtr, sizeof(initFile)); + strlcat(initFile, "/", sizeof(initFile)); + strlcat(initFile, INIT_FILE, sizeof(initFile)); -- cgit v1.2.3