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

[tor/master] Remove Process initializer/shutdown function from main.c.
by nickm＠torproject.org 21 Dec '18

21 Dec '18

commit 01819faaba0b4817ce15d29be0944e23268e76c4 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Dec 20 14:36:59 2018 +0100 Remove Process initializer/shutdown function from main.c. See: https://bugs.torproject.org/28847 --- src/app/main/main.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index aa322046f..d71e43ec3 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -74,7 +74,6 @@ #include "lib/net/resolve.h" #include "lib/process/waitpid.h" -#include "lib/process/process.h" #include "lib/meminfo/meminfo.h" #include "lib/osinfo/uname.h" @@ -560,9 +559,6 @@ tor_init(int argc, char *argv[]) addressmap_init(); /* Init the client dns cache. Do it always, since it's * cheap. */ - /* Initialize Process subsystem. */ - process_init(); - /* Initialize the HS subsystem. */ hs_init(); @@ -790,7 +786,6 @@ tor_free_all(int postfork) circuitmux_ewma_free_all(); accounting_free_all(); protover_summary_cache_free_all(); - process_free_all(); if (!postfork) { config_free_all();

1 0

[tor/master] Don't initialize the process module manually in tests.
by nickm＠torproject.org 21 Dec '18

21 Dec '18

commit bc836d559dce5756f8ad2150d2351220ba7610f2 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Dec 20 17:03:50 2018 +0100 Don't initialize the process module manually in tests. It's not longer needed for us to initialize the process module in tests. See: https://bugs.torproject.org/28847 --- src/test/test_process.c | 27 --------------------------- src/test/test_process_slow.c | 8 -------- src/test/test_pt.c | 9 --------- 3 files changed, 44 deletions(-) diff --git a/src/test/test_process.c b/src/test/test_process.c index 9b62862f0..27c9935e0 100644 --- a/src/test/test_process.c +++ b/src/test/test_process.c @@ -142,8 +142,6 @@ static void test_default_values(void *arg) { (void)arg; - process_init(); - process_t *process = process_new("/path/to/nothing"); /* We are not running by default. */ @@ -171,14 +169,12 @@ test_default_values(void *arg) done: process_free(process); - process_free_all(); } static void test_environment(void *arg) { (void)arg; - process_init(); process_t *process = process_new(""); process_environment_t *env = NULL; @@ -221,7 +217,6 @@ test_environment(void *arg) done: process_environment_free(env); process_free(process); - process_free_all(); } static void @@ -249,7 +244,6 @@ static void test_line_protocol_simple(void *arg) { (void)arg; - process_init(); process_data_t *process_data = process_data_new(); @@ -289,7 +283,6 @@ test_line_protocol_simple(void *arg) done: process_data_free(process_data); process_free(process); - process_free_all(); UNMOCK(process_read_stdout); UNMOCK(process_read_stderr); @@ -299,7 +292,6 @@ static void test_line_protocol_multi(void *arg) { (void)arg; - process_init(); process_data_t *process_data = process_data_new(); @@ -349,7 +341,6 @@ test_line_protocol_multi(void *arg) done: process_data_free(process_data); process_free(process); - process_free_all(); UNMOCK(process_read_stdout); UNMOCK(process_read_stderr); @@ -359,7 +350,6 @@ static void test_line_protocol_partial(void *arg) { (void)arg; - process_init(); process_data_t *process_data = process_data_new(); @@ -431,7 +421,6 @@ test_line_protocol_partial(void *arg) done: process_data_free(process_data); process_free(process); - process_free_all(); UNMOCK(process_read_stdout); UNMOCK(process_read_stderr); @@ -441,7 +430,6 @@ static void test_raw_protocol_simple(void *arg) { (void)arg; - process_init(); process_data_t *process_data = process_data_new(); @@ -499,7 +487,6 @@ test_raw_protocol_simple(void *arg) done: process_data_free(process_data); process_free(process); - process_free_all(); UNMOCK(process_read_stdout); UNMOCK(process_read_stderr); @@ -510,8 +497,6 @@ test_write_simple(void *arg) { (void)arg; - process_init(); - process_data_t *process_data = process_data_new(); process_t *process = process_new(""); @@ -530,7 +515,6 @@ test_write_simple(void *arg) done: process_data_free(process_data); process_free(process); - process_free_all(); UNMOCK(process_write_stdin); } @@ -540,8 +524,6 @@ test_exit_simple(void *arg) { (void)arg; - process_init(); - process_data_t *process_data = process_data_new(); process_t *process = process_new(""); @@ -566,14 +548,12 @@ test_exit_simple(void *arg) process_set_data(process, process_data); process_data_free(process_data); process_free(process); - process_free_all(); } static void test_argv_simple(void *arg) { (void)arg; - process_init(); process_t *process = process_new("/bin/cat"); char **argv = NULL; @@ -600,7 +580,6 @@ test_argv_simple(void *arg) done: tor_free(argv); process_free(process); - process_free_all(); } static void @@ -608,8 +587,6 @@ test_unix(void *arg) { (void)arg; #ifndef _WIN32 - process_init(); - process_t *process = process_new(""); /* On Unix all processes should have a Unix process handle. */ @@ -617,7 +594,6 @@ test_unix(void *arg) done: process_free(process); - process_free_all(); #endif } @@ -626,8 +602,6 @@ test_win32(void *arg) { (void)arg; #ifdef _WIN32 - process_init(); - process_t *process = process_new(""); char *joined_argv = NULL; @@ -675,7 +649,6 @@ test_win32(void *arg) done: tor_free(joined_argv); process_free(process); - process_free_all(); #endif } diff --git a/src/test/test_process_slow.c b/src/test/test_process_slow.c index a1f99bff0..845662bde 100644 --- a/src/test/test_process_slow.c +++ b/src/test/test_process_slow.c @@ -203,9 +203,6 @@ test_callbacks(void *arg) filename = TEST_PROCESS; #endif - /* Initialize Process subsystem. */ - process_init(); - /* Process callback data. */ process_data_t *process_data = process_data_new(); @@ -285,7 +282,6 @@ test_callbacks(void *arg) done: process_data_free(process_data); process_free(process); - process_free_all(); } static void @@ -300,9 +296,6 @@ test_callbacks_terminate(void *arg) filename = TEST_PROCESS; #endif - /* Initialize Process subsystem. */ - process_init(); - /* Process callback data. */ process_data_t *process_data = process_data_new(); @@ -332,7 +325,6 @@ test_callbacks_terminate(void *arg) done: process_data_free(process_data); process_free(process); - process_free_all(); } struct testcase_t slow_process_tests[] = { diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 8fcdd5c1e..c8b9d1882 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -151,8 +151,6 @@ test_pt_get_transport_options(void *arg) config_line_t *cl = NULL; (void)arg; - process_init(); - execve_args = tor_malloc(sizeof(char*)*2); execve_args[0] = tor_strdup("cheeseshop"); execve_args[1] = NULL; @@ -192,7 +190,6 @@ test_pt_get_transport_options(void *arg) config_free_lines(cl); managed_proxy_destroy(mp, 0); smartlist_free(transport_list); - process_free_all(); } static void @@ -256,8 +253,6 @@ test_pt_get_extrainfo_string(void *arg) char *s = NULL; (void) arg; - process_init(); - argv1 = tor_malloc_zero(sizeof(char*)*3); argv1[0] = tor_strdup("ewige"); argv1[1] = tor_strdup("Blumenkraft"); @@ -291,7 +286,6 @@ test_pt_get_extrainfo_string(void *arg) smartlist_free(t1); smartlist_free(t2); tor_free(s); - process_free_all(); } static int @@ -347,8 +341,6 @@ test_pt_configure_proxy(void *arg) managed_proxy_t *mp = NULL; (void) arg; - process_init(); - dummy_state = tor_malloc_zero(sizeof(or_state_t)); MOCK(process_read_stdout, process_read_stdout_replacement); @@ -463,7 +455,6 @@ test_pt_configure_proxy(void *arg) tor_free(mp->argv[0]); tor_free(mp->argv); tor_free(mp); - process_free_all(); } /* Test the get_pt_proxy_uri() function. */

1 0

[tor/master] Merge branch 'ticket28847'
by nickm＠torproject.org 21 Dec '18

21 Dec '18

commit ab4395d08206d82f69512340cf5372d5121561ad Merge: 9190f43b1 bc836d559 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 21 13:26:47 2018 -0500 Merge branch 'ticket28847' changes/ticket28847 | 3 +++ src/app/main/main.c | 5 ----- src/app/main/subsystem_list.c | 2 ++ src/lib/process/include.am | 2 ++ src/lib/process/process.h | 9 ++++++--- src/lib/process/process_sys.c | 33 +++++++++++++++++++++++++++++++++ src/lib/process/process_sys.h | 14 ++++++++++++++ src/lib/time/time_sys.h | 2 +- src/test/test_process.c | 27 --------------------------- src/test/test_process_slow.c | 8 -------- src/test/test_pt.c | 9 --------- 11 files changed, 61 insertions(+), 53 deletions(-)

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 21 Dec '18

21 Dec '18

commit fdeaba84f524bf7e9534070d90fe7b989164e002 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 21 17:49:34 2018 +0000 Update translations for whisperback --- sv/sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 878889ae8..4d3c9472d 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2018-11-22 05:26+0000\n" +"PO-Revision-Date: 2018-12-21 17:45+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -175,7 +175,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" +msgstr "WhisperBack - Skicka återkoppling i ett krypterat meddelande\nCopyright (C) 2009-2018 Tails developers <tails(a)boum.org>\n\nDetta program är fri programvara; du kan distribuera det och/eller ändra\ndet under villkoren för GNU General Public License som publicerats av\nFree Software Foundation; antingen version 3 av licensen, eller (om\ndu så vill) någon senare version.\n\nDetta program distribueras i hopp om att det ska vara användbart, men\nUTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\nSÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se\nGNU General Public License för ytterligare information.\n\nDu bör ha fått en kopia av GNU General Public License tillsammans med\ndetta program. Om inte, se <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:20 msgid ""

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 21 Dec '18

21 Dec '18

commit 0a69cf100b468b29e7e744558e434224bd0cd1e5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 21 17:46:17 2018 +0000 Update translations for tails-iuk --- sv.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sv.po b/sv.po index af52fafae..9b7a51b0d 100644 --- a/sv.po +++ b/sv.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2018-12-09 13:56+0100\n" -"PO-Revision-Date: 2018-12-09 14:14+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-12-21 17:40+0000\n" +"Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -112,7 +112,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "<b>Du bör uppgradera till %{name}s %{version}s.</b>\n\nFör mer information om den nya versionen, gå till %{details_url}s\n\nVi rekommenderar att du stänger alla andra program under uppgraderingen.\nHämtning av uppgraderingen kan ta lång tid, från flera minuter till några timmar.\n\nHämtningsstorlek: %{size}s\n\nVill du uppgradera nu?" #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade available" @@ -196,15 +196,15 @@ msgid "" "The network connection will now be disabled.\n" "\n" "Please save your work and close all other applications." -msgstr "" +msgstr "Uppgraderingen hämtades.\n\nNätverksanslutningen kommer nu att inaktiveras.\n\nSpara ditt arbete och stäng alla andra program." #: ../lib/Tails/IUK/Frontend.pm:612 msgid "Upgrade successfully downloaded" -msgstr "" +msgstr "Uppgradering hämtad" #: ../lib/Tails/IUK/Frontend.pm:614 msgid "Apply upgrade" -msgstr "" +msgstr "Tillämpa uppgradering" #: ../lib/Tails/IUK/Frontend.pm:621 msgid ""

1 0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation＠torproject.org 21 Dec '18

21 Dec '18

commit 2ca43fb109b696da7099c25c04a3ade4e508b08f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 21 16:47:09 2018 +0000 Update translations for tba-torbrowserstringsdtd --- fa/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/android_strings.dtd b/fa/android_strings.dtd index 1583ef8e4..112e1b338 100644 --- a/fa/android_strings.dtd +++ b/fa/android_strings.dtd @@ -21,5 +21,5 @@ <!ENTITY firstrun_tips_next "بعدی"> <!ENTITY firstrun_onionservices_tab_title "پیازها"> <!ENTITY firstrun_onionservices_title "خدمات پیازی"> -<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> +<!ENTITY firstrun_onionservices_message "سرویس‌های پیازی سایت‌هایی هستند که با onion. تمام می‌شوند و محافظت بسیاری را برای ناشران و مراجعه‌ کنندگان فراهم می‌کنند. که این محافظت شامل حفاظت کردن در برابر سانسور می‌شود. سرویس‌های پیازی به هر کسی اجازه می‌دهد تا محتوا و سرویس‌های بی‌نام در دسترس قرار دهد ."> <!ENTITY firstrun_onionservices_next "Go to explore">

1 0

[tor/maint-0.3.5] Try @warning_flags to avoid bloating verbose make logs
by nickm＠torproject.org 21 Dec '18

21 Dec '18

commit 97c9ced70ac364f7067fc088b90184ab77c9ecd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 21 09:49:33 2018 -0500 Try @warning_flags to avoid bloating verbose make logs We now accumulate warning flags in a separate variable, "TOR_WARNING_FLAGS", and write it to a "warning_flags" file. Then we test whether the compiler will accept "@warning_flags": if so, we put "@warning_flags" in the CFLAGS; if not, we copy the contents of "$TOR_WARNING_FLAGS" into the CFLAGS. Closes ticket 28924. --- .gitignore | 3 +++ configure.ac | 38 +++++++++++++++++++++++++++++--------- warning_flags.in | 1 + 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cedff8fb3..f1ce903a1 100644 --- a/.gitignore +++ b/.gitignore @@ -72,9 +72,12 @@ uptime-*.json /mkinstalldirs /Tor*Bundle.dmg /tor-*-win32.exe +/warning_flags + /coverage_html/ /callgraph/ + # /contrib/ /contrib/dist/tor.sh /contrib/dist/torctl diff --git a/configure.ac b/configure.ac index 1d4c31f86..d992b8d01 100644 --- a/configure.ac +++ b/configure.ac @@ -2129,6 +2129,8 @@ case "$host_os" in LDFLAGS="$LDFLAGS -dead_strip" ;; esac +TOR_WARNING_FLAGS="" + # Add some more warnings which we use in development but not in the # released versions. (Some relevant gcc versions can't handle these.) # @@ -2146,6 +2148,8 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then CFLAGS="$CFLAGS -Wno-system-headers" ;; esac + CFLAGS_NOWARNINGS="$CFLAGS" + # GCC4.3 users once report trouble with -Wstrict-overflow=5. GCC5 users # have it work better. # CFLAGS="$CFLAGS -Wstrict-overflow=1" @@ -2361,7 +2365,9 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then -Wvisibility -Wvla-extension -Wzero-length-array - ], [ TOR_CHECK_CFLAGS([warning_flag]) ]) + ], [ TOR_TRY_COMPILE_WITH_CFLAGS(warning_flag, [], + [TOR_WARNING_FLAGS="$TOR_WARNING_FLAGS warning_flag" CFLAGS="$CFLAGS warning_flag"], true) + ]) dnl We should re-enable this in some later version. Clang doesn't dnl mind, but it causes trouble with GCC. @@ -2375,16 +2381,19 @@ dnl -Wthread-safety-attributes dnl -Wthread-safety-beta dnl -Wthread-safety-precise - CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith" - CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings" - CFLAGS="$CFLAGS -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2" - CFLAGS="$CFLAGS -Wwrite-strings" - CFLAGS="$CFLAGS -Wnested-externs -Wbad-function-cast -Wswitch-enum" - CFLAGS="$CFLAGS -Waggregate-return -Wpacked -Wunused" - CFLAGS="$CFLAGS -Wunused-parameter " + W_FLAGS="$W_FLAGS -W -Wfloat-equal -Wundef -Wpointer-arith" + W_FLAGS="$W_FLAGS -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings" + W_FLAGS="$W_FLAGS -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2" + W_FLAGS="$W_FLAGS -Wwrite-strings" + W_FLAGS="$W_FLAGS -Wnested-externs -Wbad-function-cast -Wswitch-enum" + W_FLAGS="$W_FLAGS -Waggregate-return -Wpacked -Wunused" + W_FLAGS="$W_FLAGS -Wunused-parameter " # These interfere with building main() { return 0; }, which autoconf # likes to use as its default program. - CFLAGS="$CFLAGS -Wold-style-definition -Wmissing-declarations" + W_FLAGS="$W_FLAGS -Wold-style-definition -Wmissing-declarations" + + TOR_WARNING_FLAGS="$TOR_WARNING_FLAGS $W_FLAGS" + CFLAGS="$CFLAGS $W_FLAGS" if test "$tor_cv_cflags__Wnull_dereference" = "yes"; then AC_DEFINE([HAVE_CFLAG_WNULL_DEREFERENCE], 1, [True if we have -Wnull-dereference]) @@ -2396,6 +2405,8 @@ dnl -Wthread-safety-precise AC_DEFINE([HAVE_CFLAG_WUNUSED_CONST_VARIABLE], 1, [True if we have -Wunused-const-variable]) fi + CFLAGS="$CFLAGS_NOWARNINGS" + if test "x$enable_fatal_warnings" = "xyes"; then # I'd like to use TOR_CHECK_CFLAGS here, but I can't, since the # default autoconf programs are full of errors. @@ -2404,6 +2415,14 @@ dnl -Wthread-safety-precise fi +AC_SUBST(TOR_WARNING_FLAGS) + +echo "$TOR_WARNING_FLAGS">warning_flags + +TOR_TRY_COMPILE_WITH_CFLAGS([@warning_flags], [], + CFLAGS="$CFLAGS @warning_flags", + CFLAGS="$CFLAGS $TOR_WARNING_FLAGS") + if test "$enable_coverage" = "yes" && test "$have_clang" = "no"; then case "$host_os" in darwin*) @@ -2427,6 +2446,7 @@ AC_CONFIG_FILES([ src/rust/.cargo/config scripts/maint/checkOptionDocs.pl scripts/maint/updateVersions.pl + warning_flags ]) if test "x$asciidoc" = "xtrue" && test "$ASCIIDOC" = "none"; then diff --git a/warning_flags.in b/warning_flags.in new file mode 100644 index 000000000..e8ebe6e9a --- /dev/null +++ b/warning_flags.in @@ -0,0 +1 @@ +@TOR_WARNING_FLAGS@ \ No newline at end of file

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 21 Dec '18

21 Dec '18

commit 9190f43b1a9a6cb4eee02c6dc0a5fae17f9bfc59 Merge: e4109020e 97c9ced70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 21 11:30:58 2018 -0500 Merge branch 'maint-0.3.5' .gitignore | 3 +++ configure.ac | 38 +++++++++++++++++++++++++++++--------- warning_flags.in | 1 + 3 files changed, 33 insertions(+), 9 deletions(-) diff --cc configure.ac index 7f0d37544,d992b8d01..76fc12be5 --- a/configure.ac +++ b/configure.ac @@@ -2426,6 -2445,8 +2445,7 @@@ AC_CONFIG_FILES( src/config/torrc.minimal src/rust/.cargo/config scripts/maint/checkOptionDocs.pl - scripts/maint/updateVersions.pl + warning_flags ]) if test "x$asciidoc" = "xtrue" && test "$ASCIIDOC" = "none"; then

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 21 Dec '18

21 Dec '18

commit 1ef2ce9f2f80b8c96f1fc1c5c5f3525bc2fdc5d9 Merge: 57931fae0 97c9ced70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 21 11:30:31 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 .gitignore | 3 +++ configure.ac | 38 +++++++++++++++++++++++++++++--------- warning_flags.in | 1 + 3 files changed, 33 insertions(+), 9 deletions(-)

1 0

[tor/master] Try @warning_flags to avoid bloating verbose make logs
by nickm＠torproject.org 21 Dec '18

21 Dec '18

commit 97c9ced70ac364f7067fc088b90184ab77c9ecd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 21 09:49:33 2018 -0500 Try @warning_flags to avoid bloating verbose make logs We now accumulate warning flags in a separate variable, "TOR_WARNING_FLAGS", and write it to a "warning_flags" file. Then we test whether the compiler will accept "@warning_flags": if so, we put "@warning_flags" in the CFLAGS; if not, we copy the contents of "$TOR_WARNING_FLAGS" into the CFLAGS. Closes ticket 28924. --- .gitignore | 3 +++ configure.ac | 38 +++++++++++++++++++++++++++++--------- warning_flags.in | 1 + 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cedff8fb3..f1ce903a1 100644 --- a/.gitignore +++ b/.gitignore @@ -72,9 +72,12 @@ uptime-*.json /mkinstalldirs /Tor*Bundle.dmg /tor-*-win32.exe +/warning_flags + /coverage_html/ /callgraph/ + # /contrib/ /contrib/dist/tor.sh /contrib/dist/torctl diff --git a/configure.ac b/configure.ac index 1d4c31f86..d992b8d01 100644 --- a/configure.ac +++ b/configure.ac @@ -2129,6 +2129,8 @@ case "$host_os" in LDFLAGS="$LDFLAGS -dead_strip" ;; esac +TOR_WARNING_FLAGS="" + # Add some more warnings which we use in development but not in the # released versions. (Some relevant gcc versions can't handle these.) # @@ -2146,6 +2148,8 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then CFLAGS="$CFLAGS -Wno-system-headers" ;; esac + CFLAGS_NOWARNINGS="$CFLAGS" + # GCC4.3 users once report trouble with -Wstrict-overflow=5. GCC5 users # have it work better. # CFLAGS="$CFLAGS -Wstrict-overflow=1" @@ -2361,7 +2365,9 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then -Wvisibility -Wvla-extension -Wzero-length-array - ], [ TOR_CHECK_CFLAGS([warning_flag]) ]) + ], [ TOR_TRY_COMPILE_WITH_CFLAGS(warning_flag, [], + [TOR_WARNING_FLAGS="$TOR_WARNING_FLAGS warning_flag" CFLAGS="$CFLAGS warning_flag"], true) + ]) dnl We should re-enable this in some later version. Clang doesn't dnl mind, but it causes trouble with GCC. @@ -2375,16 +2381,19 @@ dnl -Wthread-safety-attributes dnl -Wthread-safety-beta dnl -Wthread-safety-precise - CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith" - CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings" - CFLAGS="$CFLAGS -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2" - CFLAGS="$CFLAGS -Wwrite-strings" - CFLAGS="$CFLAGS -Wnested-externs -Wbad-function-cast -Wswitch-enum" - CFLAGS="$CFLAGS -Waggregate-return -Wpacked -Wunused" - CFLAGS="$CFLAGS -Wunused-parameter " + W_FLAGS="$W_FLAGS -W -Wfloat-equal -Wundef -Wpointer-arith" + W_FLAGS="$W_FLAGS -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings" + W_FLAGS="$W_FLAGS -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2" + W_FLAGS="$W_FLAGS -Wwrite-strings" + W_FLAGS="$W_FLAGS -Wnested-externs -Wbad-function-cast -Wswitch-enum" + W_FLAGS="$W_FLAGS -Waggregate-return -Wpacked -Wunused" + W_FLAGS="$W_FLAGS -Wunused-parameter " # These interfere with building main() { return 0; }, which autoconf # likes to use as its default program. - CFLAGS="$CFLAGS -Wold-style-definition -Wmissing-declarations" + W_FLAGS="$W_FLAGS -Wold-style-definition -Wmissing-declarations" + + TOR_WARNING_FLAGS="$TOR_WARNING_FLAGS $W_FLAGS" + CFLAGS="$CFLAGS $W_FLAGS" if test "$tor_cv_cflags__Wnull_dereference" = "yes"; then AC_DEFINE([HAVE_CFLAG_WNULL_DEREFERENCE], 1, [True if we have -Wnull-dereference]) @@ -2396,6 +2405,8 @@ dnl -Wthread-safety-precise AC_DEFINE([HAVE_CFLAG_WUNUSED_CONST_VARIABLE], 1, [True if we have -Wunused-const-variable]) fi + CFLAGS="$CFLAGS_NOWARNINGS" + if test "x$enable_fatal_warnings" = "xyes"; then # I'd like to use TOR_CHECK_CFLAGS here, but I can't, since the # default autoconf programs are full of errors. @@ -2404,6 +2415,14 @@ dnl -Wthread-safety-precise fi +AC_SUBST(TOR_WARNING_FLAGS) + +echo "$TOR_WARNING_FLAGS">warning_flags + +TOR_TRY_COMPILE_WITH_CFLAGS([@warning_flags], [], + CFLAGS="$CFLAGS @warning_flags", + CFLAGS="$CFLAGS $TOR_WARNING_FLAGS") + if test "$enable_coverage" = "yes" && test "$have_clang" = "no"; then case "$host_os" in darwin*) @@ -2427,6 +2446,7 @@ AC_CONFIG_FILES([ src/rust/.cargo/config scripts/maint/checkOptionDocs.pl scripts/maint/updateVersions.pl + warning_flags ]) if test "x$asciidoc" = "xtrue" && test "$ASCIIDOC" = "none"; then diff --git a/warning_flags.in b/warning_flags.in new file mode 100644 index 000000000..e8ebe6e9a --- /dev/null +++ b/warning_flags.in @@ -0,0 +1 @@ +@TOR_WARNING_FLAGS@ \ No newline at end of file

1 0