From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id A8AF71F45D for ; Sat, 21 Mar 2020 09:22:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727104AbgCUJWR (ORCPT ); Sat, 21 Mar 2020 05:22:17 -0400 Received: from mail-qv1-f66.google.com ([209.85.219.66]:35931 "EHLO mail-qv1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726345AbgCUJWR (ORCPT ); Sat, 21 Mar 2020 05:22:17 -0400 Received: by mail-qv1-f66.google.com with SMTP id z13so4473351qvw.3 for ; Sat, 21 Mar 2020 02:22:16 -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 :mime-version:content-transfer-encoding; bh=nsep9eFqDJqK599AyBuyguj4crSxZCp/l2148748kJg=; b=romVce3gpiObfyo6Bs/87Kmn1IUdl9I+iplWAp2+cbssVCs88Je2zbt9i9ZWT58dyb DU1xshGxyhZAPOThr+ewaM0DdSAniR6/CzDKsiaj+aRQA+Wh4NLzYsDyMypqff49mOYE Y2W9X8EB+UPUsa8k/lfsNwsJ9DGAUsbMwqSiNI5jEs/kfzwoSgz7wTsD0488ZzY1ScnY 7/kWHMVWonmqv4qrkPyAjYS7ux0Esi7RjGU0ErwPUSzUwiVrNmIJ9KnY/CALuoPnEiHg uJu0YeDdIZueBeaJmqhnpkw/Uqh3cLoihR46PWFdMxjKm9/9abhhAM+bAGZeD7nydPEl 0+7Q== 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:mime-version:content-transfer-encoding; bh=nsep9eFqDJqK599AyBuyguj4crSxZCp/l2148748kJg=; b=Jb4weo2lGmR2mC2FUQ/dZFrPDmIRX+JCdfQZqMldHS+BNxmKYhnDODOM26Tmpts+o9 +VZ7VDTEaP3lT9yqugEGwvynDwA7ZC+N0+Meoe724EjJIhi8KBSZ8yGBVlMPu+lqDcGW TAtKU45C/wPUnWNLrB4Z38wuV8F1t4SW0ZT7s80de9K2npxxRWG5yEkfqTJqVkvPrZwu LYKzZWQZuRjZGPBx0sf3plKEK64qQuAaFExTB4SCiQ8myMyrXt6siYDbdybcRKYQHAhl OJX9WRX/j8nW2uKebuK+g1T63EJpBUi2FfA4d5HgVRJ/hoQJzSioagDkcHWfg5aY1BgG UGtw== X-Gm-Message-State: ANhLgQ0/1zD5h5IbfGDaDjuLJXS5xzJunfim6n/ndVMTv4WSL+dwNrCp xZhFQbIs1sHQ5sUyOuzxDoSGBRbl X-Google-Smtp-Source: ADFU+vsKzBfrRdPXUyX4viK6cl/y1icN7A0VrJ4rghOu8p+3a9pomuzahj4rvpc+KNCMTHiL45zGyg== X-Received: by 2002:ad4:4364:: with SMTP id u4mr11677961qvt.58.1584782535933; Sat, 21 Mar 2020 02:22:15 -0700 (PDT) Received: from archbookpro.lan ([199.249.110.29]) by smtp.gmail.com with ESMTPSA id z23sm6579890qkg.21.2020.03.21.02.22.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 02:22:15 -0700 (PDT) From: Denton Liu To: Git Mailing List Cc: Alban Gruin , Johannes Schindelin , Junio C Hamano , Phillip Wood Subject: [PATCH v3 03/19] sequencer: use file strbuf for read_oneliner() Date: Sat, 21 Mar 2020 05:21:22 -0400 Message-Id: <7c37777f07191c8ac1d26300f9465b90758550b2.1584782450.git.liu.denton@gmail.com> X-Mailer: git-send-email 2.25.0.114.g5b0ca878e0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In the original read_oneliner logic, we duplicated the logic for strbuf_trim_trailing_newline() with one exception: instead of preventing buffer accesses below index 0, it would prevent buffer accesses below index `orig_len`. Although this is correct, it isn't worth having the duplicated logic around. Add a second strbuf to which files are read and run strbuf_trim_trailing_newline() directly on this strbuf then concatenate this strbuf with the argument strbuf at the end of the function. The function's external behaviour is unchanged. Signed-off-by: Denton Liu --- sequencer.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/sequencer.c b/sequencer.c index e528225e78..c49fe76fe6 100644 --- a/sequencer.c +++ b/sequencer.c @@ -431,26 +431,28 @@ static int write_message(const void *buf, size_t len, const char *filename, static int read_oneliner(struct strbuf *buf, const char *path, int skip_if_empty) { - int orig_len = buf->len; + int ret = 0; + struct strbuf file_buf = STRBUF_INIT; if (!file_exists(path)) return 0; - if (strbuf_read_file(buf, path, 0) < 0) { + if (strbuf_read_file(&file_buf, path, 0) < 0) { warning_errno(_("could not read '%s'"), path); - return 0; + goto done; } - if (buf->len > orig_len && buf->buf[buf->len - 1] == '\n') { - if (--buf->len > orig_len && buf->buf[buf->len - 1] == '\r') - --buf->len; - buf->buf[buf->len] = '\0'; - } + strbuf_trim_trailing_newline(&file_buf); - if (skip_if_empty && buf->len == orig_len) - return 0; + if (skip_if_empty && !file_buf.len) + goto done; - return 1; + strbuf_addbuf(buf, &file_buf); + ret = 1; + +done: + strbuf_release(&file_buf); + return ret; } static struct tree *empty_tree(struct repository *r) -- 2.25.0.114.g5b0ca878e0