commit 844dcb38c8a7b83168d452351a694e504e2263e3
author Jaeden Amero <jaeden.amero@arm.com> Thu Mar 29 10:54:25 2018 +0100
committer Jaeden Amero <jaeden.amero@arm.com> Thu Mar 29 10:54:25 2018 +0100
tree aa99971c518b19196523df588985e5e7e0009e43
parent 5166a188eb9e1e18659e06d661b5648e8e12217d
parent 69944b1e67d63e2c5da0b214a82b04f382995552

Merge remote-tracking branch 'upstream-public/pr/1134' into mbedtls-2.7-proposed

Fixes #504 and fixes #1057 for the 2.7 branch

scripts/generate_errors.pl

diff --git a/scripts/generate_errors.pl b/scripts/generate_errors.pl
index 59618d4..ac0fbff 100755
--- a/scripts/generate_errors.pl
+++ b/scripts/generate_errors.pl
@@ -47,7 +47,14 @@
 
 $/ = $line_separator;
 
-open(GREP, "grep \"define MBEDTLS_ERR_\" $include_dir/* |") || die("Failure when calling grep: $!");
+my @files = <$include_dir/*.h>;
+my @matches;
+foreach my $file (@files) {
+    open(FILE, "$file");
+    my @grep_res = grep(/^\s*#define\s+MBEDTLS_ERR_\w+\s+\-0x[0-9A-Fa-f]+/, <FILE>);
+    push(@matches, @grep_res);
+    close FILE;
+}
 
 my $ll_old_define = "";
 my $hl_old_define = "";
@@ -59,7 +66,8 @@
 
 my %error_codes_seen;
 
-while (my $line = <GREP>)
+
+foreach my $line (@matches)
 {
     next if ($line =~ /compat-1.2.h/);
     my ($error_name, $error_code) = $line =~ /(MBEDTLS_ERR_\w+)\s+\-(0x\w+)/;