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
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
|
diff -Naur sc-im-0.7.0/src/cmds_command.c sc-im-0.7.0+iPhone/src/cmds_command.c
--- sc-im-0.7.0/src/cmds_command.c 2017-12-13 17:48:59.000000000 +0000
+++ sc-im-0.7.0+iPhone/src/cmds_command.c 2019-04-17 14:23:10.309275806 +0000
@@ -46,7 +46,7 @@
#include <wchar.h>
#include <stdlib.h>
#include <ctype.h> // for isprint()
-#include <wordexp.h>
+#include "wordexp.h"
#include "sc.h" // for rescol
#include "conf.h"
#include "cmds_command.h"
diff -Naur sc-im-0.7.0/src/file.c sc-im-0.7.0+iPhone/src/file.c
--- sc-im-0.7.0/src/file.c 2017-12-13 17:48:59.000000000 +0000
+++ sc-im-0.7.0+iPhone/src/file.c 2019-04-17 14:22:52.813269422 +0000
@@ -53,7 +53,7 @@
#include <unistd.h>
#include <wchar.h>
#include <sys/wait.h>
-#include <wordexp.h>
+#include "wordexp.h"
#include "conf.h"
#include "maps.h"
diff -Naur sc-im-0.7.0/src/main.c sc-im-0.7.0+iPhone/src/main.c
--- sc-im-0.7.0/src/main.c 2017-12-13 17:48:59.000000000 +0000
+++ sc-im-0.7.0+iPhone/src/main.c 2019-04-17 14:22:24.025259625 +0000
@@ -60,7 +60,7 @@
#include <fcntl.h> // for F_GETFL O_NONBLOCK F_SETFL
#include <locale.h>
#include <wchar.h>
-#include <wordexp.h>
+#include "wordexp.h"
#include <sys/ioctl.h> // for ioctl
#include "main.h"
diff -Naur sc-im-0.7.0/src/wordexp.c sc-im-0.7.0+iPhone/src/wordexp.c
--- sc-im-0.7.0/src/wordexp.c 1970-01-01 00:00:00.000000000 +0000
+++ sc-im-0.7.0+iPhone/src/wordexp.c 2019-04-17 14:25:52.777348253 +0000
@@ -0,0 +1,209 @@
+/*
+ * Copyright 1994, University Corporation for Atmospheric Research
+ * See ../COPYRIGHT file for copying and redistribution conditions.
+ */
+/*
+ * Reproduction of ../COPYRIGHT file:
+ *
+ *********************************************************************
+
+Copyright 1995-2002 University Corporation for Atmospheric Research/Unidata
+
+Portions of this software were developed by the Unidata Program at the
+University Corporation for Atmospheric Research.
+
+Access and use of this software shall impose the following obligations
+and understandings on the user. The user is granted the right, without
+any fee or cost, to use, copy, modify, alter, enhance and distribute
+this software, and any derivative works thereof, and its supporting
+documentation for any purpose whatsoever, provided that this entire
+notice appears in all copies of the software, derivative works and
+supporting documentation. Further, UCAR requests that the user credit
+UCAR/Unidata in any publications that result from the use of this
+software or in any product that includes this software. The names UCAR
+and/or Unidata, however, may not be used in any advertising or publicity
+to endorse or promote any products or commercial entity unless specific
+written permission is obtained from UCAR/Unidata. The user also
+understands that UCAR/Unidata is not obligated to provide the user with
+any support, consulting, training or assistance of any kind with regard
+to the use, operation and performance of this software nor to provide
+the user with any updates, revisions, new versions or "bug fixes."
+
+THIS SOFTWARE IS PROVIDED BY UCAR/UNIDATA "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL UCAR/UNIDATA BE LIABLE FOR ANY SPECIAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ *********************************************************************
+ */
+
+/* $Id: wordexp.c,v 1.13 2002/12/26 16:46:46 steve Exp $ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "wordexp.h"
+
+
+
+/*
+ * Translate return value from wordexp() into a string
+ */
+const char *
+s_wrde_err(int wrde_err)
+{
+ switch(wrde_err) {
+ case 0: return "No Error";
+ case WRDE_BADCHAR: return "WRDE_BADCHAR";
+ case WRDE_BADVAL: return "WRDE_BADVAL";
+ case WRDE_CMDSUB: return "WRDE_CMDSUB";
+ case WRDE_NOSPACE: return "WRDE_NOSPACE";
+ case WRDE_SYNTAX: return "WRDE_SYNTAX";
+ }
+ /* default */
+ return "Unknown Error";
+}
+
+
+/*ARGSUSED*/
+int
+wordexp(const char *words, wordexp_t *pwordexp, int flags)
+{
+ const char *ccp;
+ char **argv;
+ const char *buf;
+ size_t argc;
+ enum states {ARGSTART, IN_QUOTE, NOT_IN_QUOTE, DONE};
+ enum classes {EOS, SPACE, QUOTE, OTHER};
+ int state = ARGSTART;
+ char *argbuf;
+ const char *sp;
+ char *dp;
+ int status = 0;
+
+ /* devour leading white space */
+ for(ccp = words; *ccp != 0 && isspace(*ccp); )
+ ccp++;
+ /* skip comments */
+ if(*ccp == '#')
+ {
+ pwordexp->we_wordc = 0;
+ pwordexp->we_wordv = NULL;
+ return 0;
+ }
+
+/* If every other character was a space ... */
+#define MAXNARGS(str) ((strlen(str) +1)/2 +1)
+ argv = (char **)calloc(MAXNARGS(ccp), sizeof(char *));
+ if(argv == NULL)
+ return WRDE_NOSPACE;
+
+ buf = ccp;
+
+ argbuf = malloc(strlen(words)+1); /* where each arg is built */
+ if (argbuf == NULL)
+ {
+ free(argv);
+ return WRDE_NOSPACE;
+ }
+
+ sp = buf;
+ dp = argbuf;
+ argc = 0;
+ while(state != DONE)
+ {
+ int class;
+
+ if (*sp == 0)
+ class = EOS;
+ else if (isspace(*sp))
+ class = SPACE;
+ else if (*sp == '"')
+ class = QUOTE;
+ else
+ class = OTHER;
+ switch (state) {
+ case ARGSTART:
+ switch(class) {
+ case EOS:
+ state = DONE;
+ break;
+ case SPACE:
+ sp++;
+ break;
+ case QUOTE:
+ sp++;
+ state = IN_QUOTE;
+ break;
+ case OTHER:
+ *dp++ = *sp++;
+ state = NOT_IN_QUOTE;
+ break;
+ }
+ break;
+ case IN_QUOTE:
+ switch(class) {
+ case EOS: /* unmatched quote */
+ state = DONE;
+ status = WRDE_SYNTAX;
+ break;
+ case QUOTE:
+ sp++;
+ state = NOT_IN_QUOTE;
+ break;
+ case SPACE:
+ case OTHER:
+ *dp++ = *sp++;
+ break;
+ }
+ break;
+ case NOT_IN_QUOTE:
+ switch(class) {
+ case EOS:
+ *dp = 0;
+ dp = argbuf;
+ argv[argc++] = strdup(argbuf);
+ state = DONE;
+ break;
+ case SPACE:
+ *dp = 0;
+ dp = argbuf;
+ argv[argc++] = strdup(argbuf);
+ sp++;
+ state = ARGSTART;
+ break;
+ case QUOTE:
+ sp++;
+ state = IN_QUOTE;
+ break;
+ case OTHER:
+ *dp++ = *sp++;
+ break;
+ }
+ break;
+ }
+ }
+ argv[argc] = NULL;
+
+ pwordexp->we_wordc = argc;
+ pwordexp->we_wordv = argv;
+
+ free(argbuf);
+
+ return status;
+}
+
+void
+wordfree(wordexp_t *pwordexp)
+{
+ if(pwordexp == NULL || pwordexp->we_wordv == NULL)
+ return;
+ if(*pwordexp->we_wordv)
+ free(*pwordexp->we_wordv);
+ free(pwordexp->we_wordv);
+}
diff -Naur sc-im-0.7.0/src/wordexp.h sc-im-0.7.0+iPhone/src/wordexp.h
--- sc-im-0.7.0/src/wordexp.h 1970-01-01 00:00:00.000000000 +0000
+++ sc-im-0.7.0+iPhone/src/wordexp.h 2019-04-17 14:24:09.137299413 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright 1994, University Corporation for Atmospheric Research
+ * See ../COPYRIGHT file for copying and redistribution conditions.
+ */
+/*
+ * Reproduction of ../COPYRIGHT file:
+ *
+ *********************************************************************
+
+Copyright 1995-2002 University Corporation for Atmospheric Research/Unidata
+
+Portions of this software were developed by the Unidata Program at the
+University Corporation for Atmospheric Research.
+
+Access and use of this software shall impose the following obligations
+and understandings on the user. The user is granted the right, without
+any fee or cost, to use, copy, modify, alter, enhance and distribute
+this software, and any derivative works thereof, and its supporting
+documentation for any purpose whatsoever, provided that this entire
+notice appears in all copies of the software, derivative works and
+supporting documentation. Further, UCAR requests that the user credit
+UCAR/Unidata in any publications that result from the use of this
+software or in any product that includes this software. The names UCAR
+and/or Unidata, however, may not be used in any advertising or publicity
+to endorse or promote any products or commercial entity unless specific
+written permission is obtained from UCAR/Unidata. The user also
+understands that UCAR/Unidata is not obligated to provide the user with
+any support, consulting, training or assistance of any kind with regard
+to the use, operation and performance of this software nor to provide
+the user with any updates, revisions, new versions or "bug fixes."
+
+THIS SOFTWARE IS PROVIDED BY UCAR/UNIDATA "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL UCAR/UNIDATA BE LIABLE FOR ANY SPECIAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ *********************************************************************
+ *
+ */
+
+/* $Id: wordexp.h,v 1.5 1994/05/12 20:46:40 davis Exp $ */
+#ifndef _WORDEXP_H
+#define _WORDEXP_H
+
+#include <sys/cdefs.h>
+#include <_types.h>
+#include <sys/_types/_size_t.h>
+#include <Availability.h>
+
+typedef struct {
+ size_t we_wordc;
+ char **we_wordv;
+ size_t we_offs;
+} wordexp_t;
+
+/* wordexp() flags Argument */
+#define WRDE_APPEND 0x01
+#define WRDE_DOOFFS 0x02
+#define WRDE_NOCMD 0x04
+#define WRDE_REUSE 0x08
+#define WRDE_SHOWERR 0x10
+#define WRDE_UNDEF 0x20
+
+/*
+ * wordexp() Return Values
+ */
+/* required */
+#define WRDE_BADCHAR 1
+#define WRDE_BADVAL 2
+#define WRDE_CMDSUB 3
+#define WRDE_NOSPACE 4
+#define WRDE_NOSYS 5
+#define WRDE_SYNTAX 6
+
+
+__BEGIN_DECLS
+int wordexp(const char * __restrict, wordexp_t * __restrict, int);
+void wordfree(wordexp_t *);
+__END_DECLS
+
+#endif /* _WORDEXP_H */
|
