From patchwork Sun May 24 15:42:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11567477 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 494F4913 for ; Sun, 24 May 2020 15:44:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2EF7C20826 for ; Sun, 24 May 2020 15:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590335071; bh=jokbN3NGZp4GxmPd/V8f77vyIlCzP6y8kVazHPUN87E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CxyXvbLNh51PwR8MPe6Fnao7K4zLXw9QYofhXnfz0rWzLF1m9YML73NxQ3mMpoV+N ikrUUQDBf/hFew6nb0in4qEploxmUgxNoeY8gVdYueNQG1Jal/RyYEQOjsYlpq6haE Oj4TfdTmC/WUSg7ljcPcxFoIj8AKcCu5UrWrRzPM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387946AbgEXPoa (ORCPT ); Sun, 24 May 2020 11:44:30 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:19688 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727027AbgEXPnX (ORCPT ); Sun, 24 May 2020 11:43:23 -0400 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-09.nifty.com with ESMTP id 04OFgcUk017561; Mon, 25 May 2020 00:42:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 04OFgcUk017561 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1590334959; bh=nKuyY8CWwhIv8DlS0BU0K/zLR1ARr1TiRaQi9/5mMiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LdL0vsrRuRZaidtm9cXkudo2LB7KXceJ7vGKv+lsy64WEzUlau1KOOvOB7j8YjNm6 yia1YKiv8LogrmTM5mbCQkQnM1xtoi2qSdYcJTxHO7F7irJMDmKieA5Y9TtUc/yKfL rgcBrP+dDFVuct4zKwsTserQKkbL/XTb9S7sl3H5TEQdU3LEjEcubTmfYtp5vMRgjH PhtbOFQX83DRhhFuVZY9ZDGeAqgaOprhcGfw0nGgOtYKmWo1FDQBwA3yD6dDifjwkP KJss9oKujfs6fw8fP+cZsL68XqhIYnCP0UrAW8BsJW1jSMJK+SGb9VLxIBBgzJ9GfT nMXdKUnkrb5rw== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 01/29] modpost: drop RCS/CVS $Revision handling in MODULE_VERSION() Date: Mon, 25 May 2020 00:42:07 +0900 Message-Id: <20200524154235.380482-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200524154235.380482-1-masahiroy@kernel.org> References: <20200524154235.380482-1-masahiroy@kernel.org> MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org As far as I understood, this code gets rid of '$Revision$' or '$Revision:' of CVS, RCS or whatever in MODULE_VERSION() tags. Remove the primeval code. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/mod/modpost.c | 3 -- scripts/mod/modpost.h | 4 --- scripts/mod/sumversion.c | 66 ---------------------------------------- 3 files changed, 73 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 4d4b979d76be..77e5425759e2 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -2074,9 +2074,6 @@ static void read_symbols(const char *modname) check_sec_ref(mod, modname, &info); version = get_modinfo(&info, "version"); - if (version) - maybe_frob_rcs_version(modname, version, info.modinfo, - version - (char *)info.hdr); if (version || (all_versions && !is_vmlinux(modname))) get_src_version(modname, mod->srcversion, sizeof(mod->srcversion)-1); diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 39f6c29fb568..bbaf5cc37bfb 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -187,10 +187,6 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, void add_moddevtable(struct buffer *buf, struct module *mod); /* sumversion.c */ -void maybe_frob_rcs_version(const char *modfilename, - char *version, - void *modinfo, - unsigned long modinfo_offset); void get_src_version(const char *modname, char sum[], unsigned sumlen); /* from modpost.c */ diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index 63062024ce0e..f27f22420cbc 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c @@ -429,69 +429,3 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) release: release_file(file, len); } - -static void write_version(const char *filename, const char *sum, - unsigned long offset) -{ - int fd; - - fd = open(filename, O_RDWR); - if (fd < 0) { - warn("changing sum in %s failed: %s\n", - filename, strerror(errno)); - return; - } - - if (lseek(fd, offset, SEEK_SET) == (off_t)-1) { - warn("changing sum in %s:%lu failed: %s\n", - filename, offset, strerror(errno)); - goto out; - } - - if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) { - warn("writing sum in %s failed: %s\n", - filename, strerror(errno)); - goto out; - } -out: - close(fd); -} - -static int strip_rcs_crap(char *version) -{ - unsigned int len, full_len; - - if (strncmp(version, "$Revision", strlen("$Revision")) != 0) - return 0; - - /* Space for version string follows. */ - full_len = strlen(version) + strlen(version + strlen(version) + 1) + 2; - - /* Move string to start with version number: prefix will be - * $Revision$ or $Revision: */ - len = strlen("$Revision"); - if (version[len] == ':' || version[len] == '$') - len++; - while (isspace(version[len])) - len++; - memmove(version, version+len, full_len-len); - full_len -= len; - - /* Preserve up to next whitespace. */ - len = 0; - while (version[len] && !isspace(version[len])) - len++; - memmove(version + len, version + strlen(version), - full_len - strlen(version)); - return 1; -} - -/* Clean up RCS-style version numbers. */ -void maybe_frob_rcs_version(const char *modfilename, - char *version, - void *modinfo, - unsigned long version_offset) -{ - if (strip_rcs_crap(version)) - write_version(modfilename, version, version_offset); -}