December 2016 - tor-commits - lists.torproject.org

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 16 Dec '16

16 Dec '16

commit de5628e695baf03bedd60d19badde04502f8aa62 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 16 16:15:39 2016 +0000 Update translations for tails-greeter --- fr/fr.po | 30 +++++++++++++++--------------- fr_CA/fr_CA.po | 16 ++++++++-------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index acc5ab9..ea71b4a 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-02 14:43+0200\n" -"PO-Revision-Date: 2016-12-16 15:24+0000\n" +"PO-Revision-Date: 2016-12-16 16:09+0000\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -40,11 +40,11 @@ msgstr "Bienvenue dans Tails" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "Activer la persistance ?" +msgstr "Utiliser la persistance ?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation (en)</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -60,7 +60,7 @@ msgstr "Phrase de passe :" #: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" -msgstr "Lecture-Seule ?" +msgstr "Lecture-seule ?" #: ../glade/persistencewindow.glade.h:10 msgid "<i>Wrong passphrase. Please try again.</i>" @@ -92,7 +92,7 @@ msgstr "Mot de passe :" #: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" -msgstr "Vérification du mot de passe :" +msgstr "Vérifier le mot de passe :" #: ../glade/optionswindow.glade.h:9 msgid "<i>Passwords do not match</i>" @@ -106,7 +106,7 @@ msgstr "Déguisement de l'adresse MAC" msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation (en)</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -118,37 +118,37 @@ msgstr "Le déguisement de l'adresse MAC dissimule le numéro de série de vos c msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "Il est généralement plus sûr d'usurper les adresses MAC, mais cela peux aussi éveiller des soupçons ou causer des problèmes de connexion réseau." +msgstr "Il est généralement plus sûr de déguiser les adresses MAC, mais cela peut aussi éveiller des soupçons ou causer des problèmes de connexion réseau." #: ../glade/optionswindow.glade.h:14 msgid "Spoof all MAC addresses" -msgstr "Usurper toutes les adresses MAC" +msgstr "Déguiser toutes les adresses MAC" #: ../glade/optionswindow.glade.h:15 msgid "Network configuration" -msgstr "Configuration réseau" +msgstr "Configuration du réseau" #: ../glade/optionswindow.glade.h:16 msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation (en)</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" #: ../glade/optionswindow.glade.h:17 msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "La connexion internet de cet ordinateur est libre de tout bstacle. Vous pouvez vous connecter directement au réseau Tor." +msgstr "La connexion Internet de cet ordinateur est sans obstacle. Vous pouvez vous connecter directement au réseau Tor." #: ../glade/optionswindow.glade.h:18 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "La connexion internet de cet ordinateur est censurée, filtrée ou passe par un proxy. Vous devez configurer la passerelle, le pare-feu ou les paramètres du proxy." +msgstr "La connexion réseau de cet ordinateur est censurée, filtrée ou relayée par un serveur mandataire. Vous devez configurer les paramètres de pont, pare-feu ou serveur mandataire." #: ../glade/optionswindow.glade.h:19 msgid "Disable all networking" -msgstr "Désactiver tout réseau" +msgstr "Désactiver la connectivité réseau" #: ../glade/langpanel.glade.h:1 msgid " " @@ -160,11 +160,11 @@ msgstr "Langue" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "Lieu" +msgstr "Paramètres de langue" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "Agencement" +msgstr "Disposition" #: ../tailsgreeter/persistence.py:59 #, python-format diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 74d9dfb..a316046 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-02 14:43+0200\n" -"PO-Revision-Date: 2016-12-16 15:24+0000\n" +"PO-Revision-Date: 2016-12-16 16:08+0000\n" "Last-Translator: French language coordinator <french.translation(a)rbox.me>\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -114,11 +114,11 @@ msgstr "Le déguisement de l'adresse MAC dissimule le numéro de série de vos c msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "Il est généralement plus sécuritaire d'usurper les adresses MAC mais cela peut aussi éveiller des soupçons ou causer des problèmes de connexion réseau." +msgstr "Il est généralement plus sécuritaire de déguiser les adresses MAC, mais cela peut aussi éveiller des soupçons ou causer des problèmes de connexion réseau." #: ../glade/optionswindow.glade.h:14 msgid "Spoof all MAC addresses" -msgstr "Usurper toutes les adresses MAC" +msgstr "Déguiser toutes les adresses MAC" #: ../glade/optionswindow.glade.h:15 msgid "Network configuration" @@ -134,17 +134,17 @@ msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\ msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "La connexion réseau de cet ordinateur est sans obstacle. Voudriez-vous vous connecter directement au réseau Tor?" +msgstr "La connexion Internet de cet ordinateur est sans obstacle. Vous pouvez vous connecter directement au réseau Tor." #: ../glade/optionswindow.glade.h:18 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "La connexion réseau de cet ordinateur est censurée, filtrée ou relayée par un serveur mandataire. Vous devez configurer les paramètres de pont, coupe-feu ou serveur mandataire." +msgstr "La connexion réseau de cet ordinateur est censurée, filtrée ou relayée par un serveur mandataire. Vous devez configurer les paramètres de pont, pare-feu ou serveur mandataire." #: ../glade/optionswindow.glade.h:19 msgid "Disable all networking" -msgstr "Désactiver tous les réseaux" +msgstr "Désactiver la connectivité réseau" #: ../glade/langpanel.glade.h:1 msgid " " @@ -156,11 +156,11 @@ msgstr "Langue" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "Locale" +msgstr "Paramètres de langue" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "Mise en page" +msgstr "Disposition" #: ../tailsgreeter/persistence.py:59 #, python-format

1 0

[sandboxed-tor-browser/master] Bug #20979: runtime/cgo: pthread_create failed: Resource temporarily unavailable
by yawning＠torproject.org 16 Dec '16

16 Dec '16

commit c02de8ea005fb858bdbaf79dd36ea93b1014521b Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Dec 16 07:09:42 2016 +0000 Bug #20979: runtime/cgo: pthread_create failed: Resource temporarily unavailable Since we set the rlimit in the uncontainered sandboxed-tor-browser process, `RLIMIT_NPROC` is applied against every single other process/thread running as the user's real UID. --- ChangeLog | 2 ++ src/cmd/sandboxed-tor-browser/internal/sandbox/rlimit.go | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01e28d9..88d2e2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ Changes in version 0.0.3 - UNRELEASED: + * Bug 20979: runtime/cgo: pthread_create failed: Resource temporarily + unavailable. * Bug 20993: Handle the lock file better. * Bug 20970: Firefox crashes if the security slider is left at the default on certain pages. diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/rlimit.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/rlimit.go index 46cb2c2..5c4851b 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/rlimit.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/rlimit.go @@ -48,9 +48,9 @@ func lowerRlimit(resource int, newHard uint64) error { // because it should be tied into the UI. func SetSensibleRlimits() error { const ( - limStack = 8 * 1024 * 1024 // 8 MiB Firefox uses a lot with js... - limRSS = 0 // No effect as of 2.6.x... - limNproc = 512 + limStack = 8 * 1024 * 1024 // 8 MiB Firefox uses a lot with js... + limRSS = 0 // No effect as of 2.6.x... + // limNproc = 512 limNofile = 1024 // Could maybe go as low as 512... limMlock = 0 // This might need to be increased later. limLocks = 32 @@ -61,8 +61,8 @@ func SetSensibleRlimits() error { limRttime = 0 // The syscall package doesn't expose these. - RLIMIT_RSS = 5 - RLIMIT_NPROC = 6 + RLIMIT_RSS = 5 + // RLIMIT_NPROC = 6 RLIMIT_MLOCK = 8 RLIMIT_LOCKS = 10 RLIMIT_SIGPENDING = 11 @@ -78,9 +78,9 @@ func SetSensibleRlimits() error { if err := lowerRlimit(RLIMIT_RSS, limRSS); err != nil { return err } - if err := lowerRlimit(RLIMIT_NPROC, limNproc); err != nil { - return err - } + // if err := lowerRlimit(RLIMIT_NPROC, limNproc); err != nil { + // return err + // } if err := lowerRlimit(syscall.RLIMIT_NOFILE, limNofile); err != nil { return err }

1 0

[tor/master] Merge remote-tracking branch 'jryans/no-changes-unreleased'
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit b310929ee36f0a88389dca53124506115c850c3b Merge: 812a658 231564e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 16 10:57:37 2016 -0500 Merge remote-tracking branch 'jryans/no-changes-unreleased' doc/HACKING/CodingStandards.md | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Document no changes file needed for bugfixes on unreleased code
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit 231564ee5b2862925211234da45c9ccafe201be2 Author: J. Ryan Stinnett <jryans(a)gmail.com> Date: Thu Dec 8 16:48:00 2016 -1000 Document no changes file needed for bugfixes on unreleased code Fixes #20932. --- doc/HACKING/CodingStandards.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index f1c6585..01212a9 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -93,6 +93,10 @@ What needs a changes file? rewrites. Anything about which somebody might plausibly wonder "when did that happen, and/or why did we do that" 6 months down the line. +What does not need a changes file? + + * Bugfixes for code that hasn't shipped in any released version of Tor + Why use changes files instead of Git commit messages? * Git commit messages are written for developers, not users, and they

1 0

[tor/master] Use the new message function
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit e8760b6e51e9320ae039b3521b5b984e2bd8ac0c Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Dec 15 11:19:05 2016 +0000 Use the new message function Substitutions were made using `sed -e 's/print/msg/g'`. --- scripts/maint/checkSpace.pl | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl index 0249c09..6d19d6c 100755 --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@ -27,33 +27,33 @@ for my $fn (@ARGV) { # (We insist on lines that end with a single LF character, not # CR LF.) if (/\r/) { - print " CR:$fn:$.\n"; + msg " CR:$fn:$.\n"; } ## Warn about tabs. # (We only use spaces) if (/\t/) { - print " TAB:$fn:$.\n"; + msg " TAB:$fn:$.\n"; } ## Warn about labels that don't have a space in front of them # (We indent every label at least one space) if (/^[a-zA-Z_][a-zA-Z_0-9]*:/) { - print "nosplabel:$fn:$.\n"; + msg "nosplabel:$fn:$.\n"; } ## Warn about trailing whitespace. # (We don't allow whitespace at the end of the line; make your # editor highlight it for you so you can stop adding it in.) if (/ +$/) { - print "Space\@EOL:$fn:$.\n"; + msg "Space\@EOL:$fn:$.\n"; } ## Warn about control keywords without following space. # (We put a space after every 'if', 'while', 'for', 'switch', etc) if ($C && /\s(?:if|while|for|switch)\(/) { - print " KW(:$fn:$.\n"; + msg " KW(:$fn:$.\n"; } ## Warn about #else #if instead of #elif. # (We only allow #elif) if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) { - print " #else#if:$fn:$.\n"; + msg " #else#if:$fn:$.\n"; } ## Warn about some K&R violations # (We use K&R-style C, where open braces go on the same line as @@ -65,22 +65,22 @@ for my $fn (@ARGV) { # } if (/^\s+\{/ and $lastline =~ /^\s*(if|while|for|else if)/ and $lastline !~ /\{$/) { - print "non-K&R {:$fn:$.\n"; + msg "non-K&R {:$fn:$.\n"; } if (/^\s*else/ and $lastline =~ /\}$/) { - print " }\\nelse:$fn:$.\n"; + msg " }\\nelse:$fn:$.\n"; } $lastline = $_; ## Warn about unnecessary empty lines. # (Don't put an empty line before a line that contains nothing # but a closing brace.) if ($lastnil && /^\s*}\n/) { - print " UnnecNL:$fn:$.\n"; + msg " UnnecNL:$fn:$.\n"; } ## Warn about multiple empty lines. # (At most one blank line in a row.) if ($lastnil && /^$/) { - print " DoubleNL:$fn:$.\n"; + msg " DoubleNL:$fn:$.\n"; } elsif (/^$/) { $lastnil = 1; } else { @@ -90,7 +90,7 @@ for my $fn (@ARGV) { ## accept double-line lines. # (Don't make lines wider than 80 characters, including newline.) if (/^.{80}/) { - print " Wide:$fn:$.\n"; + msg " Wide:$fn:$.\n"; } ### Juju to skip over comments and strings, since the tests ### we're about to do are okay there. @@ -115,22 +115,22 @@ for my $fn (@ARGV) { ## Warn about C++-style comments. # (Use C style comments only.) if (m!//!) { - # print " //:$fn:$.\n"; + # msg " //:$fn:$.\n"; s!//.*!!; } ## Warn about unquoted braces preceded by non-space. # (No character except a space should come before a {) if (/([^\s'])\{/) { - print " $1\{:$fn:$.\n"; + msg " $1\{:$fn:$.\n"; } ## Warn about multiple internal spaces. #if (/[^\s,:]\s{2,}[^\s\\=]/) { - # print " X X:$fn:$.\n"; + # msg " X X:$fn:$.\n"; #} ## Warn about { with stuff after. #s/\s+$//; #if (/\{[^\}\\]+$/) { - # print " {X:$fn:$.\n"; + # msg " {X:$fn:$.\n"; #} ## Warn about function calls with space before parens. # (Don't put a space between the name of a function and its @@ -142,7 +142,7 @@ for my $fn (@ARGV) { $1 ne "void" and $1 ne "__attribute__" and $1 ne "op" and $1 ne "size_t" and $1 ne "double" and $1 ne "workqueue_reply_t") { - print " fn ():$fn:$.\n"; + msg " fn ():$fn:$.\n"; } } ## Warn about functions not declared at start of line. @@ -154,7 +154,7 @@ for my $fn (@ARGV) { ! /^(?:const |static )*(?:typedef|struct|union)[^\(]*$/ && ! /= *\{$/ && ! /;$/)) { if (/.\{$/){ - print "fn() {:$fn:$.\n"; + msg "fn() {:$fn:$.\n"; $in_func_head = 0; } elsif (/^\S[^\(]* +\**[a-zA-Z0-9_]+\(/) { $in_func_head = -1; # started with tp fn @@ -162,7 +162,7 @@ for my $fn (@ARGV) { $in_func_head = 0; } elsif (/\{/) { if ($in_func_head == -1) { - print "tp fn():$fn:$.\n"; + msg "tp fn():$fn:$.\n"; } $in_func_head = 0; } @@ -171,19 +171,19 @@ 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"; + msg "assert :$fn:$. (use tor_assert)\n"; } if (/\bmemcmp\(/ && not /memcmp OK/) { - print "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n"; + msg "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n"; } # always forbidden. if (not /\ OVERRIDE\ /) { if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) { - print "$& :$fn:$.\n"; + msg "$& :$fn:$.\n"; } if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) { - print "$& :$fn:$. (use tor_malloc, tor_free, etc)\n"; + msg "$& :$fn:$. (use tor_malloc, tor_free, etc)\n"; } } } @@ -191,7 +191,7 @@ for my $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"; + msg " EOL\@EOF:$fn:$.\n"; } close(F); }

1 0

[tor/master] Run check-spaces only when Perl is available
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit 032da29d28599cfb76afd58e2bff4662912ae109 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Dec 15 12:02:42 2016 +0000 Run check-spaces only when Perl is available Also permit users to override the Perl variable with relative paths. --- Makefile.am | 4 +++- configure.ac | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f400728..649ce72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -181,11 +181,13 @@ coverage-html-full: all # Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c, # tinytest*.[ch] check-spaces: - $(top_srcdir)/scripts/maint/checkSpace.pl -C \ +if USE_PERL + $(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \ $(top_srcdir)/src/common/*.[ch] \ $(top_srcdir)/src/or/*.[ch] \ $(top_srcdir)/src/test/*.[ch] \ $(top_srcdir)/src/tools/*.[ch] +endif check-docs: all $(PERL) $(top_builddir)/scripts/maint/checkOptionDocs.pl diff --git a/configure.ac b/configure.ac index afe40a4..552465c 100644 --- a/configure.ac +++ b/configure.ac @@ -195,7 +195,9 @@ AC_PROG_CPP AC_PROG_MAKE_SET AC_PROG_RANLIB -AC_PATH_PROG([PERL], [perl]) +AC_ARG_VAR([PERL], [path to Perl binary]) +AC_CHECK_PROGS([PERL], [perl]) +AM_CONDITIONAL(USE_PERL, [test "x$ac_cv_prog_PERL" != "x"]) dnl autoconf 2.59 appears not to support AC_PROG_SED AC_CHECK_PROG([SED],[sed],[sed],[/bin/false])

1 0

[tor/master] Run check-spaces when using `make check`
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit d2a091f3a2db567bea33c93579608fda0ee24234 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Dec 15 12:06:01 2016 +0000 Run check-spaces when using `make check` --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 649ce72..007a2e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,6 +82,8 @@ doxygen: test: all $(top_builddir)/src/test/test +check-local: check-spaces + need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ echo '$$CHUTNEY_PATH was not set.'; \

1 0

[tor/master] Add a changes file for ticket 5500
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit 812a6581aff4af0503d1e94cb3f0f07df7f36aa2 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Dec 16 07:38:37 2016 +0000 Add a changes file for ticket 5500 --- changes/ticket5500 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket5500 b/changes/ticket5500 new file mode 100644 index 0000000..0cdd8e1 --- /dev/null +++ b/changes/ticket5500 @@ -0,0 +1,3 @@ + o Testing: + - Perform the coding style checks when running the tests and fail when + coding style violations are found. Closes ticket 5500.

1 0

[tor/master] Convert tabs to spaces
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit 67e1eff3211ea1a051d7e2268a504dd22638d65b Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Dec 15 10:40:38 2016 +0000 Convert tabs to spaces --- scripts/maint/checkSpace.pl | 73 ++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl index e90f5b3..1b1762a 100755 --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@ -13,29 +13,29 @@ for $fn (@ARGV) { $incomment = 0; while (<F>) { ## Warn about windows-style newlines. - # (We insist on lines that end with a single LF character, not - # CR LF.) + # (We insist on lines that end with a single LF character, not + # CR LF.) if (/\r/) { print " CR:$fn:$.\n"; } ## Warn about tabs. - # (We only use spaces) + # (We only use spaces) if (/\t/) { print " TAB:$fn:$.\n"; } ## Warn about labels that don't have a space in front of them - # (We indent every label at least one space) + # (We indent every label at least one space) if (/^[a-zA-Z_][a-zA-Z_0-9]*:/) { print "nosplabel:$fn:$.\n"; } ## Warn about trailing whitespace. - # (We don't allow whitespace at the end of the line; make your - # editor highlight it for you so you can stop adding it in.) + # (We don't allow whitespace at the end of the line; make your + # editor highlight it for you so you can stop adding it in.) if (/ +$/) { print "Space\@EOL:$fn:$.\n"; } ## Warn about control keywords without following space. - # (We put a space after every 'if', 'while', 'for', 'switch', etc) + # (We put a space after every 'if', 'while', 'for', 'switch', etc) if ($C && /\s(?:if|while|for|switch)\(/) { print " KW(:$fn:$.\n"; } @@ -53,12 +53,12 @@ for $fn (@ARGV) { # other stuff; # } if (/^\s+\{/ and $lastline =~ /^\s*(if|while|for|else if)/ and - $lastline !~ /\{$/) { + $lastline !~ /\{$/) { print "non-K&R {:$fn:$.\n"; - } + } if (/^\s*else/ and $lastline =~ /\}$/) { - print " }\\nelse:$fn:$.\n"; - } + print " }\\nelse:$fn:$.\n"; + } $lastline = $_; ## Warn about unnecessary empty lines. # (Don't put an empty line before a line that contains nothing @@ -102,13 +102,13 @@ for $fn (@ARGV) { s!"(?:[^\"]+|\\.)*"!"X"!g; next if /^\#/; ## Warn about C++-style comments. - # (Use C style comments only.) + # (Use C style comments only.) if (m!//!) { # print " //:$fn:$.\n"; s!//.*!!; } ## Warn about unquoted braces preceded by non-space. - # (No character except a space should come before a {) + # (No character except a space should come before a {) if (/([^\s'])\{/) { print " $1\{:$fn:$.\n"; } @@ -122,8 +122,8 @@ for $fn (@ARGV) { # print " {X:$fn:$.\n"; #} ## Warn about function calls with space before parens. - # (Don't put a space between the name of a function and its - # arguments.) + # (Don't put a space between the name of a function and its + # arguments.) if (/(\w+)\s\(([A-Z]*)/) { if ($1 ne "if" and $1 ne "while" and $1 ne "for" and $1 ne "switch" and $1 ne "return" and $1 ne "int" and @@ -135,9 +135,9 @@ for $fn (@ARGV) { } } ## Warn about functions not declared at start of line. - # (When you're declaring functions, put "static" and "const" - # and the return type on one line, and the function name at - # the start of a new line.) + # (When you're declaring functions, put "static" and "const" + # and the return type on one line, and the function name at + # the start of a new line.) if ($in_func_head || ($fn !~ /\.h$/ && /^[a-zA-Z0-9_]/ && ! /^(?:const |static )*(?:typedef|struct|union)[^\(]*$/ && @@ -157,24 +157,24 @@ for $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/) { + 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"; + } + } } } ## Warn if the file doesn't end with a blank line. @@ -184,4 +184,3 @@ for $fn (@ARGV) { } close(F); } -

1 0

[tor/master] Declare all variables to be local
by nickm＠torproject.org 16 Dec '16

16 Dec '16

commit f43e56a6d0317d062b23faa8a1835145dbf78fcf Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Dec 15 10:47:48 2016 +0000 Declare all variables to be local Without the 'my' keyword the variables are global and Perl requires global symbols to include an explicit package name. --- scripts/maint/checkSpace.pl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl index 1b1762a..724b5a5 100755 --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@ -1,16 +1,18 @@ #!/usr/bin/perl -w +my $C = 0; + if ($ARGV[0] =~ /^-/) { - $lang = shift @ARGV; + my $lang = shift @ARGV; $C = ($lang eq '-C'); -# $TXT = ($lang eq '-txt'); } -for $fn (@ARGV) { +for my $fn (@ARGV) { open(F, "$fn"); - $lastnil = 0; - $lastline = ""; - $incomment = 0; + my $lastnil = 0; + my $lastline = ""; + my $incomment = 0; + my $in_func_head = 0; while (<F>) { ## Warn about windows-style newlines. # (We insist on lines that end with a single LF character, not

1 0