gnupg/util (ChangeLog assuan-buffer.c assuan-client.c memrchr.c)

[cvs user dshaw]

    Date: Tuesday, April 12, 2005 @ 18:08:51
  Author: dshaw
    Path: /cvs/gnupg/gnupg/util

   Added: memrchr.c
Modified: ChangeLog assuan-buffer.c assuan-client.c

Fix minor build problem on OSX (need a replacement for memrchr)


-----------------+
 ChangeLog       |    8 ++++++++
 assuan-buffer.c |    4 ++++
 assuan-client.c |    1 +
 memrchr.c       |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+)


Index: gnupg/util/ChangeLog
diff -u gnupg/util/ChangeLog:1.185 gnupg/util/ChangeLog:1.186
--- gnupg/util/ChangeLog:1.185	Tue Apr  5 19:09:12 2005
+++ gnupg/util/ChangeLog	Tue Apr 12 18:08:51 2005
@@ -1,3 +1,11 @@
+2005-04-12  David Shaw  <dshaw at jabberwocky.com>
+
+	* assuan-client.c: Fix warning on OSX.
+
+	* memrchr.c: New replacement function.
+
+	* assuan-buffer.c: Use it here.
+
 2005-04-04  Werner Koch  <wk at g10code.com>
 
 	* memory.c (xcalloc, xcalloc_secure): New wrappers.
Index: gnupg/util/assuan-buffer.c
diff -u gnupg/util/assuan-buffer.c:1.1 gnupg/util/assuan-buffer.c:1.2
--- gnupg/util/assuan-buffer.c:1.1	Tue Apr  5 19:09:12 2005
+++ gnupg/util/assuan-buffer.c	Tue Apr 12 18:08:51 2005
@@ -34,6 +34,10 @@
 #endif
 #include "assuan-defs.h"
 
+#ifndef HAVE_MEMRCHR
+void *memrchr(const void *s, int c, size_t n);
+#endif
+
 static int
 writen (assuan_context_t ctx, const char *buffer, size_t length)
 {
Index: gnupg/util/assuan-client.c
diff -u gnupg/util/assuan-client.c:1.1 gnupg/util/assuan-client.c:1.2
--- gnupg/util/assuan-client.c:1.1	Tue Apr  5 19:09:12 2005
+++ gnupg/util/assuan-client.c	Tue Apr 12 18:08:51 2005
@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <assert.h>
+#include <string.h>
 
 #include "assuan-defs.h"
 
Index: gnupg/util/memrchr.c
diff -u /dev/null gnupg/util/memrchr.c:1.1
--- /dev/null	Tue Apr 12 18:08:51 2005
+++ gnupg/util/memrchr.c	Tue Apr 12 18:08:51 2005
@@ -0,0 +1,46 @@
+/* memrchr.c - libc replacement function
+ * Copyright (C) 2005 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+/*
+  memrchr() is a GNU function that might not be available everywhere.
+  It's basically the inverse of memchr() - search backwards in a
+  memory block for a particular character.
+*/
+
+#include <config.h>
+#include <string.h>
+
+/* There are many ways to optimize this, but this is a simple
+   unoptimized implementation. */
+void *
+memrchr(const void *s, int c, size_t n)
+{
+  const unsigned char *start=s,*end=s+n-1;
+
+  while(end>=start)
+    {
+      if(*end==c)
+	return (void *)end;
+      else
+	end--;
+    }
+
+  return NULL;
+}