Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp411194ybi; Thu, 13 Jun 2019 19:04:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqx/1pwz3xMye6NQv+Vo6mMZdxG1pSqwn36MpSgV62eaadcc6sN3zeulozbQMnyCsOpqv6HD X-Received: by 2002:a63:4d17:: with SMTP id a23mr2179260pgb.22.1560477886948; Thu, 13 Jun 2019 19:04:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560477886; cv=none; d=google.com; s=arc-20160816; b=PrLn1GfMXtlZ/ncZnsWBopjgzuCQHIFS6mFkOeJXSgwkvXQLAuo2RwjEAvy7+P9voy 63VZHTLhSrnA+8E4H1dU+afeQUBmfghe1pxur7TlETwjwGZYIF43I3R2m6QgX4FFaYV3 9EH2ENSEwBrbvNTd6kfX/0yq6atv85bakBmcv8i74cpS/l+l2y3CuWIZ3Rp908gaskuV nekILxhLnDc4ubnEjx4TH3SmNB+dcSnTCwmOb/Aj1C2rBvDTPbQ/Fz8tXLSOGSsZVtgH EqwZ6/28u1OGwAwkgwgnVt7rjGQfZHK9h0umSjnW1zxEpmGcBimnqKe8zHPQnVO+4cLX CA6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=B5ljNYAaph2OUjbLpP0bTBC9oAg634tmKbVqfodSoYs=; b=R9zW4LUX7QMjCj4+WmdQN8akVit7FL1MT/KdubldljpPpv81JH13hMHokyXytbKgvc 5zii5VyIRzsufHOu0BI8PyiRP/THstwrlklvZ/ew+clY79fr134dk2h5iKJGnHKnfYUF HVFzsleMDDDOFYJt4hKoeKe8mLYvOf2meX39PgqpBB/YVC80uZ5+H2tvylavTBOyfx9z ROenDcEEsT/t+F8GqpMlWdCIFo35rGsp+YHoWpWF9ClRnyPaUelIprEiTrmKgz/ZpCr2 EbQwS+c4RdDNyfpAzDwQcUjnb4rnPgLI1OM8XMkQG9MZrSY1kwTg3g9s2wAoogYO4hEc nGkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=syAx0Veq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z1si1196753pgg.441.2019.06.13.19.04.29; Thu, 13 Jun 2019 19:04:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=syAx0Veq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726688AbfFNCE2 (ORCPT + 99 others); Thu, 13 Jun 2019 22:04:28 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:52856 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725951AbfFNCE2 (ORCPT ); Thu, 13 Jun 2019 22:04:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=B5ljNYAaph2OUjbLpP0bTBC9oAg634tmKbVqfodSoYs=; b=syAx0VeqymrYjIszYsJJDheh8A 1kZ/SvpWOfBSdAfgmThgVQlrwIEEIcR+kjNXQxRzYgHiRb56miNBXmrVNqphxnD5f21rBss7n9qGZ whFTD3E9we76ga98pEbXy2j0Gpc7U5+c62E5nR03XwOePb6vo7HsPCf9HO+HU6UKHCg526/pcZkn7 VKhTfG/VzYNZMkJQZg9LlHQQBS254pc4A/qUJiW9sPUu0ofRSX1MfzkiML/b39C3gdpo9biYYWX8P t/J2zmHIQgm/UauGcLxHuApEN8xbOtMNpo9Ut/ObwBmjddJ9dh4maA9Bimb1QwMceUO9qswDp44bB sECpJ/MA==; Received: from 201.86.169.251.dynamic.adsl.gvt.net.br ([201.86.169.251] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hbbZr-0000EC-In; Fri, 14 Jun 2019 02:04:27 +0000 Received: from mchehab by bombadil.infradead.org with local (Exim 4.92) (envelope-from ) id 1hbbZn-0002ns-RC; Thu, 13 Jun 2019 23:04:23 -0300 From: Mauro Carvalho Chehab To: Linux Doc Mailing List , Greg Kroah-Hartman Cc: Mauro Carvalho Chehab , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Jonathan Corbet , Mauro Carvalho Chehab Subject: [PATCH 06/14] scripts/get_abi.pl: parse files with text at beginning Date: Thu, 13 Jun 2019 23:04:12 -0300 Message-Id: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mauro Carvalho Chehab It sounds usefult o parse files with has some text at the beginning. Add support for it. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- scripts/get_abi.pl | 59 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/scripts/get_abi.pl b/scripts/get_abi.pl index f7c9944a833c..ac0f057fa3ca 100755 --- a/scripts/get_abi.pl +++ b/scripts/get_abi.pl @@ -55,7 +55,10 @@ sub parse_abi { my $what; my $new_what; my $tag; + my $label; my $ln; + my $has_file; + my $xrefs; print STDERR "Opening $file\n" if ($debug > 1); open IN, $file; @@ -67,7 +70,7 @@ sub parse_abi { if (!($new_tag =~ m/(what|date|kernelversion|contact|description|users)/)) { if ($tag eq "description") { - $data{$what}->{$tag} .= "\n$content";; + $data{$what}->{$tag} .= "\n$content"; $data{$what}->{$tag} =~ s/\n+$//; next; } else { @@ -83,6 +86,25 @@ sub parse_abi { $new_what = 1; } $tag = $new_tag; + + if ($has_file) { + $label = "abi_" . $content . " "; + $label =~ tr/A-Z/a-z/; + + # Convert special chars to "_" + $label =~s/[\x00-\x2f]+/_/g; + $label =~s/[\x3a-\x40]+/_/g; + $label =~s/[\x7b-\xff]+/_/g; + $label =~ s,_+,_,g; + $label =~ s,_$,,; + + $data{$what}->{label} .= $label; + + # Escape special chars from content + $content =~s/([\x00-\x1f\x21-\x2f\x3a-\x40\x7b-\xff])/\\$1/g; + + $xrefs .= "- :ref:`$content <$label>`\n\n"; + } next; } @@ -104,8 +126,18 @@ sub parse_abi { next; } - # Silently ignore any headers before the database - next if (!$tag); + # Store any contents before the database + if (!$tag) { + next if (/^\n/); + + my $my_what = "File $name"; + $data{$my_what}->{what} = "File $name"; + $data{$my_what}->{type} = "File"; + $data{$my_what}->{file} = $name; + $data{$my_what}->{description} .= $_; + $has_file = 1; + next; + } if (m/^\s*(.*)/) { $data{$what}->{$tag} .= "\n$1"; @@ -117,6 +149,11 @@ sub parse_abi { parse_error($file, $ln, "Unexpected line:", $_); } close IN; + + if ($has_file) { + my $my_what = "File $name"; + $data{$my_what}->{xrefs} = $xrefs; + } } # Outputs the output on ReST format @@ -128,8 +165,17 @@ sub output_rest { my $w = $what; $w =~ s/([\(\)\_\-\*\=\^\~\\])/\\$1/g; + if ($data{$what}->{label}) { + my @labels = split(/\s/, $data{$what}->{label}); + foreach my $label (@labels) { + printf ".. _%s:\n\n", $label; + } + } + print "$w\n\n"; - print "- defined on file $file (type: $type)\n\n::\n\n"; + + print "- defined on file $file (type: $type)\n\n" if ($type ne "File"); + print "::\n\n"; my $desc = $data{$what}->{description}; $desc =~ s/^\s+//; @@ -144,8 +190,11 @@ sub output_rest { if (!($desc =~ /^\s*$/)) { print " $desc\n\n"; } else { - print " DESCRIPTION MISSING\n\n"; + print " DESCRIPTION MISSING for $what\n\n"; } + + printf "Has the following ABI:\n\n%s", $data{$what}->{xrefs} if ($data{$what}->{xrefs}); + } } -- 2.21.0