From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 424 invoked from network); 8 Aug 2020 22:34:10 -0000 Received: from krantz.zx2c4.com (192.95.5.69) by inbox.vuxu.org with ESMTPUTF8; 8 Aug 2020 22:34:10 -0000 Received: by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTP id bbb7365e; Sat, 8 Aug 2020 22:09:11 +0000 (UTC) Return-Path: Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [2607:f8b0:4864:20::130]) by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTPS id 48930410 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 8 Aug 2020 22:09:10 +0000 (UTC) Received: by mail-il1-x130.google.com with SMTP id p13so4712737ilh.4 for ; Sat, 08 Aug 2020 15:34:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mmayer-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OcqxJL+uix8mRTaO8M2OoVRuNZl9eoHbsYEJ1ecK45k=; b=YP/0MJEdatli9eiFXrWmDoCFNtQswpdPc5nSYa0mOZv9XFbf/NbqHe7w+ex8P41q4v Yvfe8ianS08aSd8ujql9A+XnCg1q2M7kS8C+EXbGNaSpkBiMMcRKra+0m+NZO7W6T6s4 JxIpbFL4g+LKJipLtBbwpPprY3csis2lUZrWJtp9YDVWe7xVemBFdqTThLWOXieurz/h +wq1/D4vsklkOOADUlM0eEfRI4uz3WUrs9zyxVgsetiv+R20X5rrjVk0YT5pdrVSCJDV 1NdHD6NtsWt1LcyP03be6M1p87clcQWYZ2pxK9LHCvhLy5Ol6cu4977YqN5wQt65bKdm mO5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OcqxJL+uix8mRTaO8M2OoVRuNZl9eoHbsYEJ1ecK45k=; b=pHgAeFXm6/zAfjxS/pX0fArhus0XjPjOGyo5WCqFyj4llBFl7Y5VlCzzHCbjc58HjL tvspGoXQZDZnm+MiP/B7rdlV1HqWnzEVaYWuSPD4qI7JzpmPtvKUlI5E3V4fboJJEMJM grYgIOcf7RzATAg8puAt/vnr6wi01HwWujEirBC5VUASl9uVGk8qKxOp3YDRxWfk2yYC +9aBcPU+JFPnDw0NKFtqvBL3D7wPt7kzRo0zQL3fMZA2xImGjlcUedrmTaCdbn3dS6/S x2MIOzCnL9PEM0lsaJgRr4uixkgafD3YhzQnexJ7iFrxY51kFzIPijybvTA1xi5ncEbK 2pAA== X-Gm-Message-State: AOAM532KaGRBLm42jNvOeCF6EbaWzC9xcmHTMpd6j6qulvsDlPoX2/5y H6UHsKNwxsUqhjondwToAPoAsXemMMUCoNbo X-Google-Smtp-Source: ABdhPJypvsPfB+7aFwAS17npqVR8VdadeUMNT8/k1pNDJeL3Xyf7GzQDpHRUqwGnC87F/og6fayiNw== X-Received: by 2002:a65:438c:: with SMTP id m12mr16430967pgp.373.1596925692349; Sat, 08 Aug 2020 15:28:12 -0700 (PDT) Return-Path: Received: from tethys.home.lan (S0106106f3fe77680.vs.shawcable.net. [70.68.129.113]) by smtp.gmail.com with ESMTPSA id x7sm17575627pfc.209.2020.08.08.15.28.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Aug 2020 15:28:11 -0700 (PDT) From: Markus Mayer To: CGIT Mailing List Cc: Markus Mayer Subject: [PATCH] global: provide memrchr implementation for macOS Date: Sat, 8 Aug 2020 15:28:08 -0700 Message-Id: <20200808222808.46263-1-code@mmayer.net> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: cgit@lists.zx2c4.com X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: List for cgit developers and users List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cgit-bounces@lists.zx2c4.com Sender: "CGit" macOS doesn't come with a memrchr() of its own, so let's provide an implementation it can use. memrchr.c was taken from Apple's own open source site. https://opensource.apple.com/source/sudo/sudo-87.80.2/sudo/lib/util/memrchr.c It was minimally modified, so it would work for cgit: - Removed #include "sudo_compat.h" - Renamed function from sudo_memrchr() to memrchr() Signed-off-by: Markus Mayer --- I sent this a few days ago already, but it looks like it didn't make it to the mailig list. Let's give it another shot. cgit.h | 4 ++++ cgit.mk | 9 +++++++++ memrchr.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 memrchr.c diff --git a/cgit.h b/cgit.h index 7ec46b4..1b2f712 100644 --- a/cgit.h +++ b/cgit.h @@ -395,4 +395,8 @@ extern char *expand_macros(const char *txt); extern char *get_mimetype_for_filename(const char *filename); +#ifdef NEED_MEMRCHR +extern void *memrchr(const void *s, int c, size_t n); +#endif + #endif /* CGIT_H */ diff --git a/cgit.mk b/cgit.mk index 3fcc1ca..f85018c 100644 --- a/cgit.mk +++ b/cgit.mk @@ -63,10 +63,19 @@ ifeq ($(uname_S),Linux) HAVE_LINUX_SENDFILE = YesPlease endif +ifeq ($(uname_S),Darwin) + IS_DARWIN = yes +endif + ifdef HAVE_LINUX_SENDFILE CGIT_CFLAGS += -DHAVE_LINUX_SENDFILE endif +ifdef IS_DARWIN + CGIT_CFLAGS += -DNEED_MEMRCHR + CGIT_OBJ_NAMES += memrchr.o +endif + CGIT_OBJ_NAMES += cgit.o CGIT_OBJ_NAMES += cache.o CGIT_OBJ_NAMES += cmd.o diff --git a/memrchr.c b/memrchr.c new file mode 100644 index 0000000..46ec17f --- /dev/null +++ b/memrchr.c @@ -0,0 +1,49 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2007, 2010-2014 + * Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * This is an open source non-commercial project. Dear PVS-Studio, please check it. + * PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com + */ + +#include + +#ifndef HAVE_MEMRCHR + +#include + +/* + * Reverse memchr() + * Find the last occurrence of 'c' in the buffer 's' of size 'n'. + */ +void * +memrchr(const void *s, int c, size_t n) +{ + const unsigned char *cp; + + if (n != 0) { + cp = (unsigned char *)s + n; + do { + if (*(--cp) == (unsigned char)c) + return (void *)cp; + } while (--n != 0); + } + return (void *)0; +} +#endif /* HAVE_MEMRCHR */ -- 2.26.0