# HG changeset patch
# User Diego 'Flameeyes' Pettenò <[EMAIL PROTECTED]>
# Date 1181484108 -7200
# Node ID fa7a6672ad4dcb7311a3662069c70ccf48eadad0
# Parent afff318e8acb1c9ab188814c5ab3b2ec7cfdb5e7
Add checks for needed replacement (and replacement) for memmem() function, that
I'm going to use in input_http.
diff -r fa7a6672ad4dcb7311a3662069c70ccf48eadad0 -r
afff318e8acb1c9ab188814c5ab3b2ec7cfdb5e7 configure.ac
--- a/configure.ac Sun Jun 10 16:01:48 2007 +0200
+++ b/configure.ac Sun Jun 10 15:23:19 2007 +0200
@@ -860,7 +860,7 @@ AC_CHECK_FUNCS([strncasecmp _strnicmp],
AC_FUNC_FSEEKO
-AC_REPLACE_FUNCS([asprintf basename gettimeofday setenv strndup strpbrk strsep
strtok_r timegm unsetenv])
+AC_REPLACE_FUNCS([asprintf basename gettimeofday setenv strndup strpbrk strsep
strtok_r timegm unsetenv memmem])
AC_LIBSOURCE([hstrerror.c])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[hstrerror(0)]])],
diff -r fa7a6672ad4dcb7311a3662069c70ccf48eadad0 -r
afff318e8acb1c9ab188814c5ab3b2ec7cfdb5e7 lib/os_internal.h
--- a/lib/os_internal.h Sun Jun 10 16:01:48 2007 +0200
+++ b/lib/os_internal.h Sun Jun 10 15:23:19 2007 +0200
@@ -339,4 +339,13 @@ void xine_private_rewinddir(DIR
#endif
-#endif
+/* replacement of memmem */
+#ifndef HAVE_MEMMEM
+#define HAVE_MEMMEM
+#define memmem(H, HL, N, NL) \
+ xine_private_memmem((H), (HL), (N), (NL))
+void *xine_internal_memmem (const void *haystack, size_t haystack_len,
+ const void *needle, size_t needle_len);
+#endif
+
+#endif
diff -r fa7a6672ad4dcb7311a3662069c70ccf48eadad0 -r
afff318e8acb1c9ab188814c5ab3b2ec7cfdb5e7 lib/memmem.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/memmem.c Sun Jun 10 15:23:19 2007 +0200
@@ -0,0 +1,49 @@
+/* Copyright (C) 1991,92,93,94,96,97,98,2000,2004,2007 Free Software
Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#include "config.h"
+
+#include <stddef.h>
+#include <string.h>
+
+/* Return the first occurrence of NEEDLE in HAYSTACK. */
+void *xine_internal_memmem (const void *haystack, size_t haystack_len,
+ const void *needle, size_t needle_len)
+{
+ const char *begin;
+ const char *const last_possible
+ = (const char *) haystack + haystack_len - needle_len;
+
+ if (needle_len == 0)
+ /* The first occurrence of the empty string is deemed to occur at
+ the beginning of the string. */
+ return (void *) haystack;
+
+ /* Sanity check, otherwise the loop might search through the whole
+ memory. */
+ if (haystack_len < needle_len)
+ return NULL;
+
+ for (begin = (const char *) haystack; begin <= last_possible; ++begin)
+ if (begin[0] == ((const char *) needle)[0] &&
+ !memcmp ((const void *) &begin[1],
+ (const void *) ((const char *) needle + 1),
+ needle_len - 1))
+ return (void *) begin;
+
+ return NULL;
+}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
