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
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
https://github.com/fcitx/fcitx5/commit/5b12bf216dda31c0f11eb85af54a43fce9d5a2ab
Fix crashlog being inconsistent type in main/errorhandler.
--- a/src/server/errorhandler.cpp
+++ b/src/server/errorhandler.cpp
@@ -14,7 +14,7 @@
#include <cstdint>
#include <cstring>
#include <ctime>
-#include <string>
+#include <filesystem>
#include "fcitx-utils/fs.h"
#include "fcitx-utils/standardpaths.h"
#include "fcitx-utils/unixfd.h"
@@ -31,15 +31,30 @@
#define MINIMAL_BUFFER_SIZE 256
#define BACKTRACE_SIZE 32
-extern int selfpipe[2];
-extern std::string crashlog;
+namespace fcitx {
+
+static int signalPipe;
+static std::filesystem::path crashlog;
struct MinimalBuffer {
char buffer[MINIMAL_BUFFER_SIZE];
int offset;
};
-void SetMyExceptionHandler() {
+static void OnException(int signo);
+
+void SetMyExceptionHandler(int pipeFd) {
+
+ auto userDir =
+ StandardPaths::global().userDirectory(StandardPathsType::PkgConfig);
+ if (!userDir.empty()) {
+ if (fs::makePath(userDir)) {
+ crashlog = userDir / "crash.log";
+ }
+ }
+
+ signalPipe = pipeFd;
+
int signo;
for (signo = SIGHUP; signo < SIGUNUSED; signo++) {
@@ -115,7 +130,7 @@ static inline void _write_buffer(int fd, const MinimalBuffer *buffer) {
void OnException(int signo) {
if (signo == SIGCHLD) {
uint8_t sig = (signo & 0xff);
- fcitx::fs::safeWrite(selfpipe[1], &sig, 1);
+ fcitx::fs::safeWrite(signalPipe, &sig, 1);
signal(signo, OnException);
return;
}
@@ -180,10 +195,12 @@ void OnException(int signo) {
if (signo < 0xff) {
sig = (uint8_t)(signo & 0xff);
}
- fcitx::fs::safeWrite(selfpipe[1], &sig, 1);
+ fcitx::fs::safeWrite(signalPipe, &sig, 1);
signal(signo, OnException);
} break;
}
}
+} // namespace fcitx
+
// kate: indent-mode cstyle; space-indent on; indent-width 0;
--- a/src/server/errorhandler.h
+++ b/src/server/errorhandler.h
@@ -16,23 +16,15 @@
#ifndef SIGUNUSED
#define SIGUNUSED 29
#endif
-/* ***********************************************************
-// Data structures
-// *********************************************************** */
-/* ***********************************************************
-// Functions
-// *********************************************************** */
+namespace fcitx {
//
// Set Posix Signal Handler
//
//
-void SetMyExceptionHandler(void);
+void SetMyExceptionHandler(int pipeFd);
-//
-// Process Posix signal
-//
-void OnException(int signo);
+} // namespace fcitx
#endif
--- a/src/server/main.cpp
+++ b/src/server/main.cpp
@@ -8,21 +8,17 @@
#include <sys/stat.h>
#include <clocale>
#include <cstdio>
-#include <cstdlib>
#include <exception>
#include <filesystem>
#include <iostream>
#include <string>
-#include <utility>
#include <vector>
#include "fcitx-utils/environ.h"
-#include "fcitx-utils/fs.h"
#include "fcitx-utils/log.h"
#include "fcitx-utils/misc.h"
#include "fcitx-utils/misc_p.h"
#include "fcitx-utils/standardpath.h"
#include "fcitx-utils/standardpaths.h"
-#include "fcitx-utils/stringutils.h"
#include "fcitx/addonfactory.h"
#include "fcitx/addoninstance.h"
#include "fcitx/addonloader.h"
@@ -31,8 +27,6 @@
#include "errorhandler.h"
using namespace fcitx;
-int selfpipe[2];
-std::filesystem::path crashlog;
FCITX_DEFINE_STATIC_ADDON_REGISTRY(getStaticAddon)
#ifdef ENABLE_KEYBOARD
@@ -43,7 +37,8 @@ int main(int argc, char *argv[]) {
umask(077);
StandardPath::global().syncUmask();
StandardPaths::global().syncUmask();
- if (safePipe(selfpipe) < 0) {
+ int selfPipe[2];
+ if (safePipe(selfPipe) < 0) {
fprintf(stderr, "Could not create self-pipe.\n");
return 1;
}
@@ -54,15 +49,7 @@ int main(int argc, char *argv[]) {
return 1;
}
- auto userDir =
- StandardPaths::global().userDirectory(StandardPathsType::PkgConfig);
- if (!userDir.empty()) {
- if (fs::makePath(userDir)) {
- crashlog = userDir / "crash.log";
- }
- }
-
- SetMyExceptionHandler();
+ SetMyExceptionHandler(selfPipe[1]);
setlocale(LC_ALL, "");
@@ -74,7 +61,7 @@ int main(int argc, char *argv[]) {
FCITX_LOG_IF(Info, isInFlatpak()) << "Running inside flatpak.";
Instance instance(argc, argv);
instance.setBinaryMode();
- instance.setSignalPipe(selfpipe[0]);
+ instance.setSignalPipe(selfPipe[0]);
instance.addonManager().registerDefaultLoader(&getStaticAddon());
ret = instance.exec();
|
