-
-
Notifications
You must be signed in to change notification settings - Fork 17
/
0001-fix-msginit.patch
253 lines (243 loc) · 6.52 KB
/
0001-fix-msginit.patch
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
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
--- a/gettext-tools/src/msginit.c Thu Jul 07 15:29:24 2016
+++ b/gettext-tools/src/msginit.c Thu Jul 07 15:33:16 2016
@@ -872,59 +872,10 @@
}
}
/* It contains no version, just a package name. */
return old_field;
}
-
- gettextlibdir = getenv ("GETTEXTLIBDIR");
- if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
- gettextlibdir = relocate (LIBDIR "/gettext");
-
- prog = xconcatenated_filename (gettextlibdir, "project-id", NULL);
-
- /* Call the project-id shell script. */
- argv[0] = "/bin/sh";
- argv[1] = prog;
- argv[2] = NULL;
- child = create_pipe_in (prog, "/bin/sh", argv, DEV_NULL, false, true, false,
- fd);
- if (child == -1)
- goto failed;
-
- /* Retrieve its result. */
- fp = fdopen (fd[0], "r");
- if (fp == NULL)
- {
- error (0, errno, _("fdopen() failed"));
- goto failed;
- }
-
- line = NULL; linesize = 0;
- linelen = getline (&line, &linesize, fp);
- if (linelen == (size_t)(-1))
- {
- error (0, 0, _("%s subprocess I/O error"), prog);
- fclose (fp);
- goto failed;
- }
- if (linelen > 0 && line[linelen - 1] == '\n')
- line[linelen - 1] = '\0';
-
- fclose (fp);
-
- /* Remove zombie process from process list, and retrieve exit status. */
- exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL);
- if (exitstatus != 0)
- {
- error (0, 0, _("%s subprocess failed with exit code %d"),
- prog, exitstatus);
- goto failed;
- }
-
- return line;
-
-failed:
return "PACKAGE";
}
/* Construct the value for the Project-Id-Version field. */
@@ -946,60 +897,10 @@
/* Return the old value if present, assuming it was already filled in by
xgettext. */
old_field = get_field (header, "Project-Id-Version");
if (old_field != NULL && strcmp (old_field, "PACKAGE VERSION") != 0)
return old_field;
-
- gettextlibdir = getenv ("GETTEXTLIBDIR");
- if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
- gettextlibdir = relocate (LIBDIR "/gettext");
-
- prog = xconcatenated_filename (gettextlibdir, "project-id", NULL);
-
- /* Call the project-id shell script. */
- argv[0] = "/bin/sh";
- argv[1] = prog;
- argv[2] = "yes";
- argv[3] = NULL;
- child = create_pipe_in (prog, "/bin/sh", argv, DEV_NULL, false, true, false,
- fd);
- if (child == -1)
- goto failed;
-
- /* Retrieve its result. */
- fp = fdopen (fd[0], "r");
- if (fp == NULL)
- {
- error (0, errno, _("fdopen() failed"));
- goto failed;
- }
-
- line = NULL; linesize = 0;
- linelen = getline (&line, &linesize, fp);
- if (linelen == (size_t)(-1))
- {
- error (0, 0, _("%s subprocess I/O error"), prog);
- fclose (fp);
- goto failed;
- }
- if (linelen > 0 && line[linelen - 1] == '\n')
- line[linelen - 1] = '\0';
-
- fclose (fp);
-
- /* Remove zombie process from process list, and retrieve exit status. */
- exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL);
- if (exitstatus != 0)
- {
- error (0, 0, _("%s subprocess failed with exit code %d"),
- prog, exitstatus);
- goto failed;
- }
-
- return line;
-
-failed:
return "PACKAGE VERSION";
}
/* Construct the value for the PO-Revision-Date field. */
@@ -1100,66 +1001,10 @@
/* Return the user's email address. */
static const char *
get_user_email ()
{
- const char *prog = relocate (LIBDIR "/gettext/user-email");
- char *argv[4];
- pid_t child;
- int fd[1];
- FILE *fp;
- char *line;
- size_t linesize;
- size_t linelen;
- int exitstatus;
-
- /* Ask the user for his email address. */
- argv[0] = "/bin/sh";
- argv[1] = (char *) prog;
- argv[2] = (char *) _("\
-The new message catalog should contain your email address, so that users can\n\
-give you feedback about the translations, and so that maintainers can contact\n\
-you in case of unexpected technical problems.\n");
- argv[3] = NULL;
- child = create_pipe_in (prog, "/bin/sh", argv, DEV_NULL, false, true, false,
- fd);
- if (child == -1)
- goto failed;
-
- /* Retrieve his answer. */
- fp = fdopen (fd[0], "r");
- if (fp == NULL)
- {
- error (0, errno, _("fdopen() failed"));
- goto failed;
- }
-
- line = NULL; linesize = 0;
- linelen = getline (&line, &linesize, fp);
- if (linelen == (size_t)(-1))
- {
- error (0, 0, _("%s subprocess I/O error"), prog);
- fclose (fp);
- goto failed;
- }
- if (linelen > 0 && line[linelen - 1] == '\n')
- line[linelen - 1] = '\0';
-
- fclose (fp);
-
- /* Remove zombie process from process list, and retrieve exit status. */
- exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL);
- if (exitstatus != 0)
- {
- error (0, 0, _("%s subprocess failed with exit code %d"),
- prog, exitstatus);
- goto failed;
- }
-
- return line;
-
-failed:
return "EMAIL@ADDRESS";
}
/* Construct the value for the Last-Translator field. */
@@ -1199,62 +1044,10 @@
/* Return the language team's mailing list address or homepage URL. */
static const char *
language_team_address ()
{
- const char *prog = relocate (PROJECTSDIR "/team-address");
- char *argv[7];
- pid_t child;
- int fd[1];
- FILE *fp;
- char *line;
- size_t linesize;
- size_t linelen;
- int exitstatus;
-
- /* Call the team-address shell script. */
- argv[0] = "/bin/sh";
- argv[1] = (char *) prog;
- argv[2] = (char *) relocate (PROJECTSDIR);
- argv[3] = (char *) relocate (LIBDIR "/gettext");
- argv[4] = (char *) catalogname;
- argv[5] = (char *) language;
- argv[6] = NULL;
- child = create_pipe_in (prog, "/bin/sh", argv, DEV_NULL, false, true, false,
- fd);
- if (child == -1)
- goto failed;
-
- /* Retrieve its result. */
- fp = fdopen (fd[0], "r");
- if (fp == NULL)
- {
- error (0, errno, _("fdopen() failed"));
- goto failed;
- }
-
- line = NULL; linesize = 0;
- linelen = getline (&line, &linesize, fp);
- if (linelen == (size_t)(-1))
- line = "";
- else if (linelen > 0 && line[linelen - 1] == '\n')
- line[linelen - 1] = '\0';
-
- fclose (fp);
-
- /* Remove zombie process from process list, and retrieve exit status. */
- exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL);
- if (exitstatus != 0)
- {
- error (0, 0, _("%s subprocess failed with exit code %d"),
- prog, exitstatus);
- goto failed;
- }
-
- return line;
-
-failed:
return "";
}
/* Construct the value for the Language-Team field. */