1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 23 Sep 2025 13:23:46 -0400
Subject: Revert "Remove path prefix in RNP_LOG"
This reverts commit b618d207acd986872f4e53a96576055fa90f6176.
Forwarded: https://github.com/rnpgp/rnp/issues/2358
---
CMakeLists.txt | 9 ---------
src/lib/logging.h | 6 +-----
src/tests/cli_tests.py | 5 -----
3 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e47ff86..366302b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,10 +96,6 @@ set_property(CACHE ENABLE_DOC PROPERTY STRINGS ${TRISTATE_VALUES})
# so we can use our bundled finders
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules")
-# add source path prefix length to be able to crop it in logs
-string(LENGTH "${CMAKE_SOURCE_DIR}/" SOURCE_PATH_SIZE)
-add_definitions("-DSOURCE_PATH_SIZE=${SOURCE_PATH_SIZE}")
-
# required modules
include(CTest)
include(FetchContent)
@@ -198,11 +194,6 @@ if (ENABLE_DOC)
include(AdocMan)
endif()
-# make sure that msvc set full path in __FILE__ macro
-if(MSVC)
- add_compile_options(/FC)
-endif()
-
# everything else is in subdirs
add_subdirectory(src/examples)
if (ENABLE_FUZZERS)
diff --git a/src/lib/logging.h b/src/lib/logging.h
index 81bd76d..0378f66 100644
--- a/src/lib/logging.h
+++ b/src/lib/logging.h
@@ -58,11 +58,7 @@ class LogStop {
};
} // namespace rnp
-/* remove "src" */
-#ifndef SOURCE_PATH_SIZE
-#define SOURCE_PATH_SIZE 0
-#endif
-#define __SOURCE_PATH_FILE__ (&(__FILE__[SOURCE_PATH_SIZE + 3]))
+#define __SOURCE_PATH_FILE__ __FILE__
#define RNP_LOG_FD(fd, ...) \
do { \
diff --git a/src/tests/cli_tests.py b/src/tests/cli_tests.py
index f3ff7e8..00179ef 100755
--- a/src/tests/cli_tests.py
+++ b/src/tests/cli_tests.py
@@ -4274,11 +4274,6 @@ class Misc(unittest.TestCase):
self.assertEqual(ret, 0)
self.assertRegex(out, r'(?s)^.*Hello.*$')
- def test_warning_source_path_prefix_cropping(self):
- ret, _, err = run_proc(RNPK, ['--keyfile', data_path(PUBRING_7), '--notty', '--list-keys'])
- self.assertEqual(ret, 0)
- self.assertRegex(err, r'(?s)^.*\[signature_validate\(\) [/\\]lib[/\\]crypto[/\\]signatures.cpp:[0-9]*\] Insecure hash algorithm [0-9]*, marking signature as invalid.*$')
-
def test_armor_with_spaces_import(self):
ret, out, err = run_proc(RNPK, ['--homedir', RNPDIR2, '--import', data_path('test_stream_key_load/ecc-25519-pub.spaces.asc')])
self.assertEqual(ret, 0)
|
