From patchwork Wed Apr 5 01:14:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 9662811 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B947A6021C for ; Wed, 5 Apr 2017 01:17:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A95EB23B24 for ; Wed, 5 Apr 2017 01:17:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E3AF27CF3; Wed, 5 Apr 2017 01:17:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5247123B24 for ; Wed, 5 Apr 2017 01:17:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754192AbdDEBRJ (ORCPT ); Tue, 4 Apr 2017 21:17:09 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34748 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754717AbdDEBRF (ORCPT ); Tue, 4 Apr 2017 21:17:05 -0400 Received: by mail-wm0-f67.google.com with SMTP id x75so189832wma.1 for ; Tue, 04 Apr 2017 18:17:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TGSG+KrUyxPXLckFe6nqGI0dhhhWOVnSaGt9Hw/+/AQ=; b=BNLZMyA4wgXXgxyND0s1UI7zDl4wtdvuY9tm69AV8PyTzf5v1HKjOqQmRovDi5lLzO dgx5zMab5Y1U3V7b7fZ+W0ifHUUkhblTVvvm69sUP6nRC0fxbCSOlT6DSxzPUQpHRjk/ iEL4jQrf52np1PF8qmyNExjHdF3QMJOxJMvMLr5T+4kHGUC+44DnW0fzZx434d8MOjT2 vUrJzUdHe4hC4Unh4ajUyEXjScFELBYQ1ZsLrcQ6y+/JGqKmMcgNyMaythblI2ckeV90 IlzhkY12f00vv4HfiGQhWwT0BcUnxTiHQmp8EG6pES1vJKkSjFUBxPJIxrwxjJTSSidq bdyw== 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:in-reply-to :references; bh=TGSG+KrUyxPXLckFe6nqGI0dhhhWOVnSaGt9Hw/+/AQ=; b=bluY3GJqi1K7KMbIheeuMJqcNoIxc69HNSZmKh5JloLOjmGIEPpfhDLD730hcWKoz2 MXoJxGwBZjgVWNUj51J0tK1c/Mr8+zXKSXegid7Wk+RGtydHW73md2XcVJpeQ1HuKryV Aja/GpyvCvneTogsM8g5mzZSwFGtUgEAKgIrH5kdCDX2EfDmkX1TcS42knm9s7FKInFB QFwUMLhdsu6cZdZvgU+ds0+VYnnoRJohio4i+m8/K1wSOmPIUqYm1/FupoWJptr/FfAQ WnsyfglYfyf8K/dBtwAbqUD/3pe1AWfafFbHJ8AkN07XHT7Vje9ASovcxZea0vNRq+x/ Egeg== X-Gm-Message-State: AFeK/H1U3qX07hUzgjuz8ZR7OToqS3RNtbwDsdSZgGK2EFrosiETDhzY cWGYiJSaHvrydA== X-Received: by 10.28.180.87 with SMTP id d84mr16809105wmf.118.1491355024549; Tue, 04 Apr 2017 18:17:04 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:88d:1900:706c:6cb1:d133:7ca3]) by smtp.gmail.com with ESMTPSA id b82sm20310668wmh.4.2017.04.04.18.17.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2017 18:17:04 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH 2/3] add sparse_basename() Date: Wed, 5 Apr 2017 03:14:54 +0200 Message-Id: <20170405011455.60222-3-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170405011455.60222-1-luc.vanoostenryck@gmail.com> References: <20170405011455.60222-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add sparse_basename() as a simplified version of basename() working on Unix and non-unix environments. Signed-off-by: Luc Van Oostenryck --- Makefile | 1 + compat.h | 1 + compat/basename.c | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 compat/basename.c diff --git a/Makefile b/Makefile index e8edd95f6..b4826728c 100644 --- a/Makefile +++ b/Makefile @@ -107,6 +107,7 @@ LIB_OBJS= target.o parse.o tokenize.o pre-process.o symbol.o lib.o scope.o \ expression.o show-parse.o evaluate.o expand.o inline.o linearize.o \ char.o sort.o allocate.o compat-$(OS).o ptrlist.o \ builtin.o \ + compat/basename.o \ flow.o cse.o simplify.o memops.o liveness.o storage.o unssa.o dissect.o LIB_FILE= libsparse.a diff --git a/compat.h b/compat.h index 9814ae3e8..5b69548af 100644 --- a/compat.h +++ b/compat.h @@ -24,5 +24,6 @@ struct stat; void *blob_alloc(unsigned long size); void blob_free(void *addr, unsigned long size); long double string_to_ld(const char *nptr, char **endptr); +const char *sparse_basename(const char *path); #endif diff --git a/compat/basename.c b/compat/basename.c new file mode 100644 index 000000000..c9770229c --- /dev/null +++ b/compat/basename.c @@ -0,0 +1,16 @@ +#include "compat.h" +#include + +const char *sparse_basename(const char *path) +{ + const char *last; + + last = strrchr(path, '/'); + path = last ? last + 1 : path; +#if defined(_WIN32) || defined(_WIN64) + last = strrchr(path, '\\'); + path = last ? last + 1 : path; +#endif + + return path; +}