diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2012-11-21 21:09:54 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2012-11-21 21:09:54 +0000 |
| commit | 55cd705d8a66ba4982547be9edde31b49d5989dd (patch) | |
| tree | c030f12dc121e7a7131e5b62c4cc57cad0a71a4d /lang/newlisp/files/patch-newlisp.c | |
| parent | Update to 3.0.8, unbreak with utmpx. (diff) | |
Upgrade to version 10.4.5.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=307625
Diffstat (limited to 'lang/newlisp/files/patch-newlisp.c')
| -rw-r--r-- | lang/newlisp/files/patch-newlisp.c | 14 |
1 files changed, 7 insertions, 7 deletions
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)); |