|
|
After I sent the patch to review for inclusion in the openbsd ports tree, I was pointed that my patch is nonsense.
-- snip -- -- --
ifeq ($(patsubstr GNU/%,glibc,$(shell uname -o)),glibc)
ADDITIONAL_CPPFLAGS += \
-DHAVE_STRNDUP
endif
ifneq ($(findstring openbsd, $(GNUSTEP_TARGET_OS)), openbsd)
ADDITIONAL_CPPFLAGS += -DHAVE_STRNDUP
endif
-- snip -- -- --
So, as distributed:
If we're using glibc, add -DHAVE_STRNDUP.
If we're not OpenBSD, add -DHAVE_STRNDUP.
-> all OS except OpenBSD have -DHAVE_STRNDUP set. So this whole
macro is only used on OpenBSD and we're removing it.
Since all OS besides OpenBSD has strndup, I completely removed this cruft from the GNUmakefile.preamble, and also removed the hand rolled strndup in the NGMimeRFC822DateHeaderFieldParser.m. see attached patch. |
|
|
do-not-use-hand-rolled-strndup-at-all.txt (1,384 bytes)
$OpenBSD$
OpenBSD has strndup(3)
--- sope-mime/NGMime/GNUmakefile.preamble.orig Tue Nov 2 15:12:14 2010
+++ sope-mime/NGMime/GNUmakefile.preamble Mon May 9 13:04:27 2011
@@ -5,15 +5,6 @@ ADDITIONAL_CPPFLAGS += \
-DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
-DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
-ifeq ($(patsubstr GNU/%,glibc,$(shell uname -o)),glibc)
-ADDITIONAL_CPPFLAGS += \
- -DHAVE_STRNDUP
-endif
-
-ifneq ($(findstring openbsd, $(GNUSTEP_TARGET_OS)), openbsd)
- ADDITIONAL_CPPFLAGS += -DHAVE_STRNDUP
-endif
-
NGMime_INCLUDE_DIRS += \
-I.. -I../.. \
-I../../sope-core/NGStreams/ \
$OpenBSD$
fix kind of random crasher in the webmail interface see bug #1022
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m.orig Sat Dec 18 12:43:50 2010
+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m Mon May 9 13:04:55 2011
@@ -19,10 +19,6 @@
02111-1307, USA.
*/
-#ifdef HAVE_STRNDUP
-#define _GNU_SOURCE 1
-#endif
-
#include <string.h>
#include "NGMimeHeaderFieldParser.h"
@@ -30,18 +26,6 @@
#include "NGMimeUtilities.h"
#include "common.h"
-#ifndef HAVE_STRNDUP
-char *strndup(const char *str, size_t len)
-{
- char *dup = (char *)malloc(len+1);
- if (dup) {
- strncpy(dup,str,len);
- dup[len]= '\0';
- }
- return dup;
-}
-#endif
-
@implementation NGMimeRFC822DateHeaderFieldParser
static NSTimeZone *gmt = nil;
|
