Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jC5Iq-0002dx-QY for mharc-grub-devel@gnu.org; Wed, 11 Mar 2020 13:37:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33394) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC5Io-0002Y4-3y for grub-devel@gnu.org; Wed, 11 Mar 2020 13:37:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC5Im-0000Dz-Vf for grub-devel@gnu.org; Wed, 11 Mar 2020 13:37:54 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:35951) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jC5Im-0000DH-PA for grub-devel@gnu.org; Wed, 11 Mar 2020 13:37:52 -0400 Received: by mail-pl1-x642.google.com with SMTP id g12so1427737plo.3 for ; Wed, 11 Mar 2020 10:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphix.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sdoBmwFxCYtoWf0N23lPKrGLQdofFpMV4a6Qsh3O2EY=; b=M3CMup0UvMOk5ty/4f8oTtRnrGl0eJx1PEipVQBZ3av+0Nk7auXhHpoyNKv+9AoADC wTbscPzVi5JO1NBPBMMFFbtPf/V3cr2UNHyrF/HHSeejP7rn/d57xl3s3trz9EOFyfqM 734YbcHdJsFGH0f+VhSEoepnB2My1kAzN4bZg= 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=sdoBmwFxCYtoWf0N23lPKrGLQdofFpMV4a6Qsh3O2EY=; b=DBxg21UrM3DtQoSKu2Spwhf1JBzuC6GsKPk9MzEB/SWxtQbHuNCaYs7KDS90fo1Gd9 o38Vw83Tu3LAuiphLbagw11FanUgtDwIs981YfJEe6RdMhyXWNgNcVIR2HHzzIP9QJsJ xXP6X3gr1euuSD1w6OUjslHP1EbVqwg9sPZUzH2C56EtRTXicqsOg4VlFvAjTNkNorZt WO3l7m3CBJam94v9z6RCk4tgN8lQAUzVHwD7M5IpVU40FX86cUUwVsu+NHIbwy6ewmSo luWGyhNP/09ZXC2xe9afRVjmh+Vl9FE0RpB1gOETXXeHOe5GpdeqrQpcQlnp1c3zpW0+ h6LA== X-Gm-Message-State: ANhLgQ3lC1g8UoeGAU10L1uXlxfSGbeFHbpvmFBBQdSS3Jdof1KGZ005 3njfbv8rYE82ddu1XuNRjcALS61YKJLQBc6Xi5cnFhveGYn8fyCY718GPRuCIgH0pl46tWMU9Cx 14AvvgI/uHqTDSQeqBRx5U5t8puiB43eZA1I8N535/2TH9JgkLfAHuw== X-Google-Smtp-Source: ADFU+vv6ZZ/Genk5cBbSpvH+yKkcKiAJkIiU6Crc+j8DnhToQUe4RatPPFYx9m+/bVJsjBahYDyhkA== X-Received: by 2002:a17:902:8a89:: with SMTP id p9mr4014532plo.286.1583948269797; Wed, 11 Mar 2020 10:37:49 -0700 (PDT) Received: from localhost.localdomain (c-73-162-153-225.hsd1.ca.comcast.net. [73.162.153.225]) by smtp.gmail.com with ESMTPSA id b3sm6342060pjq.38.2020.03.11.10.37.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Mar 2020 10:37:49 -0700 (PDT) From: Paul Dagnelie To: grub-devel@gnu.org Cc: mahrens@delphix.com, behlendorf1@llnl.gov, george.wilson@delphix.com, sebastien.roy@delphix.com, Paul Dagnelie Subject: [PATCH 3/7] Factor out envblk buffer creation for reuse Date: Wed, 11 Mar 2020 10:37:11 -0700 Message-Id: <20200311173715.22274-4-pcd@delphix.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20200311173715.22274-1-pcd@delphix.com> References: <20200311173715.22274-1-pcd@delphix.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 17:37:55 -0000 This patch factors out the filling of the grubenv buffer into a separate function for reuse. Signed-off-by: Paul Dagnelie --- include/grub/util/install.h | 3 +++ util/editenv.c | 26 +++++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/include/grub/util/install.h b/include/grub/util/install.h index 2631b1074..2ca349503 100644 --- a/include/grub/util/install.h +++ b/include/grub/util/install.h @@ -246,6 +246,9 @@ grub_install_get_blocklist (grub_device_t root_dev, void *data), void *hook_data); +void +grub_util_create_envblk_buffer (char *, size_t); + void grub_util_create_envblk_file (const char *name); diff --git a/util/editenv.c b/util/editenv.c index 81f68bd10..45aeba259 100644 --- a/util/editenv.c +++ b/util/editenv.c @@ -32,13 +32,29 @@ #define DEFAULT_ENVBLK_SIZE 1024 #define GRUB_ENVBLK_MESSAGE "# WARNING: Do not edit this file by tools other than "PACKAGE"-editenv!!!\n" +void +grub_util_create_envblk_buffer (char *buf, size_t size) +{ + if (size < DEFAULT_ENVBLK_SIZE) + grub_util_error (_("Envblock buffer too small")); + char *pbuf; + pbuf = buf; + memcpy (pbuf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1); + pbuf += sizeof (GRUB_ENVBLK_SIGNATURE) - 1; + memcpy (pbuf, GRUB_ENVBLK_MESSAGE, sizeof (GRUB_ENVBLK_MESSAGE) - 1); + pbuf += sizeof (GRUB_ENVBLK_MESSAGE) - 1; + memset (pbuf , '#', + size - sizeof (GRUB_ENVBLK_SIGNATURE) - sizeof (GRUB_ENVBLK_MESSAGE) + 2); +} + void grub_util_create_envblk_file (const char *name) { FILE *fp; - char *buf, *pbuf, *namenew; + char *buf, *namenew; buf = xmalloc (DEFAULT_ENVBLK_SIZE); + grub_util_create_envblk_buffer(buf, DEFAULT_ENVBLK_SIZE); namenew = xasprintf ("%s.new", name); fp = grub_util_fopen (namenew, "wb"); @@ -46,14 +62,6 @@ grub_util_create_envblk_file (const char *name) grub_util_error (_("cannot open `%s': %s"), namenew, strerror (errno)); - pbuf = buf; - memcpy (pbuf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1); - pbuf += sizeof (GRUB_ENVBLK_SIGNATURE) - 1; - memcpy (pbuf, GRUB_ENVBLK_MESSAGE, sizeof (GRUB_ENVBLK_MESSAGE) - 1); - pbuf += sizeof (GRUB_ENVBLK_MESSAGE) - 1; - memset (pbuf , '#', - DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) - sizeof (GRUB_ENVBLK_MESSAGE) + 2); - if (fwrite (buf, 1, DEFAULT_ENVBLK_SIZE, fp) != DEFAULT_ENVBLK_SIZE) grub_util_error (_("cannot write to `%s': %s"), namenew, strerror (errno)); -- 2.19.0