summaryrefslogtreecommitdiff
path: root/lang/newlisp/files/patch-newlisp.c
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2012-11-04 01:50:45 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2012-11-04 01:50:45 +0000
commit72aa83ec7822d17d45d35090476d807535d2e042 (patch)
tree431146f044a44cad37df5e028aca79f1f35168e2 /lang/newlisp/files/patch-newlisp.c
parentUpdate to 2.2.0 (diff)
Upgrade to version 10.4.4.
Feature safe: yes
Notes
Notes: svn path=/head/; revision=306949
Diffstat (limited to 'lang/newlisp/files/patch-newlisp.c')
-rw-r--r--lang/newlisp/files/patch-newlisp.c47
1 files changed, 25 insertions, 22 deletions
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);
+ }
+ }