From 72aa83ec7822d17d45d35090476d807535d2e042 Mon Sep 17 00:00:00 2001
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Sun, 4 Nov 2012 01:50:45 +0000
Subject: Upgrade to version 10.4.4.

Feature safe:	yes
---
 lang/newlisp/files/patch-newlisp.c | 47 ++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 22 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 832af70184a6..3cee50e3bb20 100644
--- a/lang/newlisp/files/patch-newlisp.c
+++ b/lang/newlisp/files/patch-newlisp.c
@@ -1,24 +1,27 @@
---- newlisp.c.orig	2009-07-03 14:29:08.000000000 +0400
-+++ newlisp.c	2009-07-03 14:30:17.000000000 +0400
-@@ -449,16 +449,16 @@
- 		strncpy(initFile, getenv("DOCUMENT_ROOT"), MAX_LINE - 16);
+
+$FreeBSD$
+
+--- newlisp.c.orig
++++ newlisp.c
+@@ -470,16 +470,16 @@
+         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);
-+	strlcat(initFile, "/.", sizeof(initFile));
-+	strlcat(initFile, INIT_FILE, sizeof(initFile));
- 	if(loadFile(initFile, 0, 0, mainContext) == NULL)
- 		{
- 		envPtr = getenv("NEWLISPDIR");
- 	  	if(envPtr)
- 	  		{
--			strlcpy(initFile, envPtr, MAX_LINE - 16);
--	   		strlcat(initFile, "/", 2);
--			strlcat(initFile, INIT_FILE, 9);
-+			strlcpy(initFile, envPtr, sizeof(initFile));
-+	   		strlcat(initFile, "/", sizeof(initFile));
-+			strlcat(initFile, INIT_FILE, sizeof(initFile));
- 			loadFile(initFile, 0, 0, mainContext);		
- 			}
- 		}
+-    strlcat(initFile, "/.", 3);
+-    strlcat(initFile, INIT_FILE, 9);
++    strlcat(initFile, "/.", sizeof(initFile));
++    strlcat(initFile, INIT_FILE, sizeof(initFile));
+     if(loadFile(initFile, 0, 0, mainContext) == NULL)
+         {
+         envPtr = getenv("NEWLISPDIR");
+         if(envPtr)
+             {
+-            strlcpy(initFile, envPtr, MAX_LINE - 16);
+-            strlcat(initFile, "/", 2);
+-            strlcat(initFile, INIT_FILE, 9);
++            strlcpy(initFile, envPtr, sizeof(initFile));
++            strlcat(initFile, "/", sizeof(initFile));
++            strlcat(initFile, INIT_FILE, sizeof(initFile));
+             loadFile(initFile, 0, 0, mainContext);      
+             }
+         }
-- 
cgit v1.2.3