June 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 30 Jun '18

30 Jun '18

commit 2968c716d7689eafcf32a1f5327af7b1ad1582ce Merge: a3ec89a4f 1953a7e61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 23:11:47 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 scripts/maint/checkSpace.pl | 5 ----- 1 file changed, 5 deletions(-) diff --cc scripts/maint/checkSpace.pl index 6d19d6ccd,5af95a27e..3043eb1aa --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@@ -168,32 -157,25 +168,27 @@@ for my $fn (@ARGV) } } - ## Check for forbidden functions except when they are - # explicitly permitted - if (/\bassert\(/ && not /assert OK/) { - print "assert :$fn:$. (use tor_assert)\n"; - } - if (/\bmemcmp\(/ && not /memcmp OK/) { - print "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n"; - } - # always forbidden. - if (not / OVERRIDE /) { - if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) { - print "$& :$fn:$.\n"; - } - if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or - /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) { - print "$& :$fn:$. (use tor_malloc, tor_free, etc)\n"; - } - } + ## Check for forbidden functions except when they are + # explicitly permitted + if (/\bassert\(/ && not /assert OK/) { + msg "assert :$fn:$. (use tor_assert)\n"; + } + if (/\bmemcmp\(/ && not /memcmp OK/) { + msg "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n"; + } + # always forbidden. + if (not /\ OVERRIDE\ /) { + if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) { + msg "$& :$fn:$.\n"; + } + if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or + /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) { + msg "$& :$fn:$. (use tor_malloc, tor_free, etc)\n"; + } + } } } - ## Warn if the file doesn't end with a blank line. - # (End each file with a single blank line.) - if (! $lastnil) { - msg " EOL\@EOF:$fn:$.\n"; - } close(F); } + +exit $found;

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 30 Jun '18

30 Jun '18

commit 3808e3015a75def1cfa7554aae4c6b06d9498d73 Merge: 8093a63f9 72ee0b6f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 scripts/maint/checkSpace.pl | 5 ----- 1 file changed, 5 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 30 Jun '18

30 Jun '18

commit 72ee0b6f793949c4637c5878c51a39316f0b336e Merge: 36c372581 3c97b148a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 scripts/maint/checkSpace.pl | 5 ----- 1 file changed, 5 deletions(-)

1 0

[tor/maint-0.3.4] Finally remove our EOL@EOF check.
by nickm＠torproject.org 30 Jun '18

30 Jun '18

commit 1953a7e61d7dede47f90016cea13b38bc33554ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 18 16:10:47 2018 -0400 Finally remove our EOL@EOF check. This check was added by mistake long ago. It will be nice to see these EOLs disappear from our code over time. (backport from master) --- scripts/maint/checkSpace.pl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl index e90f5b330..5af95a27e 100755 --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@ -177,11 +177,5 @@ for $fn (@ARGV) { } } } - ## Warn if the file doesn't end with a blank line. - # (End each file with a single blank line.) - if (! $lastnil) { - print " EOL\@EOF:$fn:$.\n"; - } close(F); } -

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 30 Jun '18

30 Jun '18

commit 3c97b148a42f6863ccf4b950967ce345d2fc8cbe Merge: ed84dab8b 2968c716d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 scripts/maint/checkSpace.pl | 5 ----- 1 file changed, 5 deletions(-)

1 0

[tor/master] Finally remove our EOL@EOF check.
by nickm＠torproject.org 30 Jun '18

30 Jun '18

commit 1953a7e61d7dede47f90016cea13b38bc33554ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 18 16:10:47 2018 -0400 Finally remove our EOL@EOF check. This check was added by mistake long ago. It will be nice to see these EOLs disappear from our code over time. (backport from master) --- scripts/maint/checkSpace.pl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl index e90f5b330..5af95a27e 100755 --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@ -177,11 +177,5 @@ for $fn (@ARGV) { } } } - ## Warn if the file doesn't end with a blank line. - # (End each file with a single blank line.) - if (! $lastnil) { - print " EOL\@EOF:$fn:$.\n"; - } close(F); } -

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 30 Jun '18

30 Jun '18

commit 2968c716d7689eafcf32a1f5327af7b1ad1582ce Merge: a3ec89a4f 1953a7e61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 23:11:47 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 scripts/maint/checkSpace.pl | 5 ----- 1 file changed, 5 deletions(-) diff --cc scripts/maint/checkSpace.pl index 6d19d6ccd,5af95a27e..3043eb1aa --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@@ -168,32 -157,25 +168,27 @@@ for my $fn (@ARGV) } } - ## Check for forbidden functions except when they are - # explicitly permitted - if (/\bassert\(/ && not /assert OK/) { - print "assert :$fn:$. (use tor_assert)\n"; - } - if (/\bmemcmp\(/ && not /memcmp OK/) { - print "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n"; - } - # always forbidden. - if (not / OVERRIDE /) { - if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) { - print "$& :$fn:$.\n"; - } - if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or - /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) { - print "$& :$fn:$. (use tor_malloc, tor_free, etc)\n"; - } - } + ## Check for forbidden functions except when they are + # explicitly permitted + if (/\bassert\(/ && not /assert OK/) { + msg "assert :$fn:$. (use tor_assert)\n"; + } + if (/\bmemcmp\(/ && not /memcmp OK/) { + msg "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n"; + } + # always forbidden. + if (not /\ OVERRIDE\ /) { + if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) { + msg "$& :$fn:$.\n"; + } + if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or + /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) { + msg "$& :$fn:$. (use tor_malloc, tor_free, etc)\n"; + } + } } } - ## Warn if the file doesn't end with a blank line. - # (End each file with a single blank line.) - if (! $lastnil) { - msg " EOL\@EOF:$fn:$.\n"; - } close(F); } + +exit $found;

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 30 Jun '18

30 Jun '18

commit 3c97b148a42f6863ccf4b950967ce345d2fc8cbe Merge: ed84dab8b 2968c716d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 scripts/maint/checkSpace.pl | 5 ----- 1 file changed, 5 deletions(-)

1 0

[tor/release-0.2.9] Finally remove our EOL@EOF check.
by nickm＠torproject.org 30 Jun '18

30 Jun '18

commit 1953a7e61d7dede47f90016cea13b38bc33554ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 18 16:10:47 2018 -0400 Finally remove our EOL@EOF check. This check was added by mistake long ago. It will be nice to see these EOLs disappear from our code over time. (backport from master) --- scripts/maint/checkSpace.pl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl index e90f5b330..5af95a27e 100755 --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@ -177,11 +177,5 @@ for $fn (@ARGV) { } } } - ## Warn if the file doesn't end with a blank line. - # (End each file with a single blank line.) - if (! $lastnil) { - print " EOL\@EOF:$fn:$.\n"; - } close(F); } -

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 30 Jun '18

30 Jun '18

commit 2968c716d7689eafcf32a1f5327af7b1ad1582ce Merge: a3ec89a4f 1953a7e61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 23:11:47 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 scripts/maint/checkSpace.pl | 5 ----- 1 file changed, 5 deletions(-) diff --cc scripts/maint/checkSpace.pl index 6d19d6ccd,5af95a27e..3043eb1aa --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@@ -168,32 -157,25 +168,27 @@@ for my $fn (@ARGV) } } - ## Check for forbidden functions except when they are - # explicitly permitted - if (/\bassert\(/ && not /assert OK/) { - print "assert :$fn:$. (use tor_assert)\n"; - } - if (/\bmemcmp\(/ && not /memcmp OK/) { - print "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n"; - } - # always forbidden. - if (not / OVERRIDE /) { - if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) { - print "$& :$fn:$.\n"; - } - if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or - /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) { - print "$& :$fn:$. (use tor_malloc, tor_free, etc)\n"; - } - } + ## Check for forbidden functions except when they are + # explicitly permitted + if (/\bassert\(/ && not /assert OK/) { + msg "assert :$fn:$. (use tor_assert)\n"; + } + if (/\bmemcmp\(/ && not /memcmp OK/) { + msg "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n"; + } + # always forbidden. + if (not /\ OVERRIDE\ /) { + if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) { + msg "$& :$fn:$.\n"; + } + if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or + /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) { + msg "$& :$fn:$. (use tor_malloc, tor_free, etc)\n"; + } + } } } - ## Warn if the file doesn't end with a blank line. - # (End each file with a single blank line.) - if (! $lastnil) { - msg " EOL\@EOF:$fn:$.\n"; - } close(F); } + +exit $found;

1 0