Skip to content

Commit 7b607eb

Browse files
saghulsaghul
committed
fixup: review!
1 parent b56c421 commit 7b607eb

File tree

3 files changed

+115
-106
lines changed

3 files changed

+115
-106
lines changed

‎gen/standalone.c

Lines changed: 103 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include <inttypes.h>
44

5-
const uint32_t qjsc_standalone_size = 2369;
5+
const uint32_t qjsc_standalone_size = 2408;
66

7-
const uint8_t qjsc_standalone[2369] = {
7+
const uint8_t qjsc_standalone[2408] = {
88
0x13, 0x4c, 0x01, 0x1a, 0x73, 0x74, 0x61, 0x6e,
99
0x64, 0x61, 0x6c, 0x6f, 0x6e, 0x65, 0x2e, 0x6a,
1010
0x73, 0x01, 0x0e, 0x71, 0x6a, 0x73, 0x3a, 0x73,
@@ -80,12 +80,12 @@ const uint8_t qjsc_standalone[2369] = {
8080
0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f,
8181
0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20,
8282
0x01, 0x14, 0x62, 0x79, 0x74, 0x65, 0x4c, 0x65,
83-
0x6e, 0x67, 0x74, 0x68, 0x01, 0x3c, 0x66, 0x61,
84-
0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20,
85-
0x77, 0x72, 0x69, 0x74, 0x65, 0x20, 0x74, 0x6f,
86-
0x20, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20,
87-
0x66, 0x69, 0x6c, 0x65, 0x01, 0x0a, 0x63, 0x6c,
88-
0x6f, 0x73, 0x65, 0x01, 0x08, 0x66, 0x69, 0x6c,
83+
0x6e, 0x67, 0x74, 0x68, 0x01, 0x0a, 0x63, 0x6c,
84+
0x6f, 0x73, 0x65, 0x01, 0x3c, 0x66, 0x61, 0x69,
85+
0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x77,
86+
0x72, 0x69, 0x74, 0x65, 0x20, 0x74, 0x6f, 0x20,
87+
0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20, 0x66,
88+
0x69, 0x6c, 0x65, 0x01, 0x08, 0x66, 0x69, 0x6c,
8989
0x65, 0x01, 0x02, 0x72, 0x01, 0x0e, 0x74, 0x72,
9090
0x61, 0x69, 0x6c, 0x65, 0x72, 0x01, 0x0a, 0x6d,
9191
0x61, 0x67, 0x69, 0x63, 0x01, 0x0c, 0x6f, 0x66,
@@ -144,7 +144,7 @@ const uint8_t qjsc_standalone[2369] = {
144144
0x00, 0xbf, 0x00, 0x24, 0x01, 0x00, 0x42, 0x5c,
145145
0x00, 0x00, 0x00, 0xc0, 0x25, 0x01, 0x00, 0x0c,
146146
0x43, 0x02, 0x01, 0xc8, 0x03, 0x03, 0x09, 0x03,
147-
0x07, 0x08, 0x00, 0xcf, 0x03, 0x0c, 0xee, 0x03,
147+
0x07, 0x08, 0x00, 0xde, 0x03, 0x0c, 0xee, 0x03,
148148
0x00, 0x01, 0x00, 0xf0, 0x03, 0x00, 0x01, 0x00,
149149
0xf2, 0x03, 0x00, 0x01, 0x00, 0xf4, 0x03, 0x01,
150150
0x00, 0x30, 0xf6, 0x03, 0x01, 0x01, 0x30, 0xf8,
@@ -210,97 +210,101 @@ const uint8_t qjsc_standalone[2369] = {
210210
0x42, 0x08, 0x01, 0x00, 0x00, 0x62, 0x08, 0x00,
211211
0x62, 0x05, 0x00, 0xb4, 0x62, 0x05, 0x00, 0x41,
212212
0x17, 0x01, 0x00, 0x00, 0x24, 0x04, 0x00, 0xb4,
213-
0xa6, 0xea, 0x10, 0x38, 0x95, 0x00, 0x00, 0x00,
214-
0x11, 0x04, 0x18, 0x01, 0x00, 0x00, 0x21, 0x01,
215-
0x00, 0x2f, 0x65, 0x07, 0x00, 0x42, 0x19, 0x01,
216-
0x00, 0x00, 0x62, 0x08, 0x00, 0x24, 0x01, 0x00,
217-
0x29, 0x0c, 0x43, 0x02, 0x01, 0xca, 0x03, 0x00,
218-
0x09, 0x00, 0x07, 0x06, 0x00, 0x8c, 0x04, 0x09,
219-
0xb4, 0x04, 0x01, 0x00, 0x30, 0xfa, 0x03, 0x01,
220-
0x01, 0x30, 0xb6, 0x04, 0x01, 0x02, 0x20, 0xb8,
221-
0x04, 0x01, 0x03, 0x30, 0xba, 0x04, 0x01, 0x04,
222-
0x30, 0x82, 0x04, 0x01, 0x05, 0x30, 0xbc, 0x04,
223-
0x01, 0x06, 0x30, 0xf8, 0x03, 0x01, 0x07, 0x30,
224-
0xf6, 0x03, 0x01, 0x08, 0x30, 0xcc, 0x03, 0x00,
225-
0x0c, 0xdc, 0x03, 0x08, 0x0c, 0xe0, 0x03, 0x0a,
226-
0x00, 0xd0, 0x03, 0x02, 0x0c, 0xd2, 0x03, 0x03,
227-
0x0c, 0xd4, 0x03, 0x04, 0x0c, 0x61, 0x08, 0x00,
228-
0x61, 0x07, 0x00, 0x61, 0x06, 0x00, 0x61, 0x05,
229-
0x00, 0x61, 0x04, 0x00, 0x61, 0x03, 0x00, 0x61,
230-
0x02, 0x00, 0x61, 0x01, 0x00, 0x61, 0x00, 0x00,
231-
0x38, 0x8c, 0x00, 0x00, 0x00, 0x41, 0x09, 0x01,
232-
0x00, 0x00, 0xc9, 0x65, 0x00, 0x00, 0x42, 0x12,
233-
0x01, 0x00, 0x00, 0x62, 0x00, 0x00, 0x04, 0x1f,
234-
0x01, 0x00, 0x00, 0x24, 0x02, 0x00, 0xca, 0x62,
235-
0x01, 0x00, 0x96, 0xea, 0x1b, 0x38, 0x95, 0x00,
236-
0x00, 0x00, 0x11, 0x04, 0x20, 0x01, 0x00, 0x00,
237-
0x42, 0x5d, 0x00, 0x00, 0x00, 0x62, 0x00, 0x00,
238-
0x24, 0x01, 0x00, 0x21, 0x01, 0x00, 0x2f, 0x62,
239-
0x01, 0x00, 0x42, 0x21, 0x01, 0x00, 0x00, 0x65,
240-
0x01, 0x00, 0x41, 0x0d, 0x01, 0x00, 0x00, 0x8c,
241-
0x65, 0x00, 0x00, 0x41, 0x22, 0x01, 0x00, 0x00,
242-
0x24, 0x02, 0x00, 0xcb, 0x62, 0x02, 0x00, 0xb4,
243-
0xa6, 0xea, 0x1c, 0x38, 0x95, 0x00, 0x00, 0x00,
244-
0x11, 0x04, 0x23, 0x01, 0x00, 0x00, 0x42, 0x5d,
245-
0x00, 0x00, 0x00, 0x62, 0x02, 0x00, 0x8c, 0x24,
246-
0x01, 0x00, 0x21, 0x01, 0x00, 0x2f, 0x38, 0xa6,
247-
0x00, 0x00, 0x00, 0x11, 0x65, 0x01, 0x00, 0x41,
248-
0x0d, 0x01, 0x00, 0x00, 0x21, 0x01, 0x00, 0xcc,
249-
0x62, 0x01, 0x00, 0x42, 0x24, 0x01, 0x00, 0x00,
250-
0x62, 0x03, 0x00, 0x41, 0x0b, 0x01, 0x00, 0x00,
251-
0xb4, 0x65, 0x01, 0x00, 0x41, 0x0d, 0x01, 0x00,
252-
0x00, 0x24, 0x03, 0x00, 0x0e, 0x38, 0xa6, 0x00,
253-
0x00, 0x00, 0x11, 0x62, 0x03, 0x00, 0x41, 0x0b,
254-
0x01, 0x00, 0x00, 0xb4, 0x65, 0x01, 0x00, 0x41,
255-
0x0f, 0x01, 0x00, 0x00, 0x21, 0x03, 0x00, 0xc2,
256-
0x04, 0xdf, 0x62, 0x04, 0x00, 0xef, 0x65, 0x01,
257-
0x00, 0x41, 0x0e, 0x01, 0x00, 0x00, 0xaf, 0xea,
258-
0x1c, 0x62, 0x01, 0x00, 0x42, 0x19, 0x01, 0x00,
259-
0x00, 0x24, 0x00, 0x00, 0x0e, 0x38, 0x95, 0x00,
260-
0x00, 0x00, 0x11, 0x04, 0x25, 0x01, 0x00, 0x00,
261-
0x21, 0x01, 0x00, 0x2f, 0x38, 0xb0, 0x00, 0x00,
213+
0xa6, 0xea, 0x1f, 0x65, 0x07, 0x00, 0x42, 0x18,
214+
0x01, 0x00, 0x00, 0x62, 0x08, 0x00, 0x24, 0x01,
215+
0x00, 0x0e, 0x38, 0x95, 0x00, 0x00, 0x00, 0x11,
216+
0x04, 0x19, 0x01, 0x00, 0x00, 0x21, 0x01, 0x00,
217+
0x2f, 0x65, 0x07, 0x00, 0x42, 0x18, 0x01, 0x00,
218+
0x00, 0x62, 0x08, 0x00, 0x24, 0x01, 0x00, 0x29,
219+
0x0c, 0x43, 0x02, 0x01, 0xca, 0x03, 0x00, 0x09,
220+
0x00, 0x07, 0x06, 0x00, 0xa4, 0x04, 0x09, 0xb4,
221+
0x04, 0x01, 0x00, 0x30, 0xfa, 0x03, 0x01, 0x01,
222+
0x30, 0xb6, 0x04, 0x01, 0x02, 0x20, 0xb8, 0x04,
223+
0x01, 0x03, 0x30, 0xba, 0x04, 0x01, 0x04, 0x30,
224+
0x82, 0x04, 0x01, 0x05, 0x30, 0xbc, 0x04, 0x01,
225+
0x06, 0x30, 0xf8, 0x03, 0x01, 0x07, 0x30, 0xf6,
226+
0x03, 0x01, 0x08, 0x30, 0xcc, 0x03, 0x00, 0x0c,
227+
0xdc, 0x03, 0x08, 0x0c, 0xe0, 0x03, 0x0a, 0x00,
228+
0xd0, 0x03, 0x02, 0x0c, 0xd2, 0x03, 0x03, 0x0c,
229+
0xd4, 0x03, 0x04, 0x0c, 0x61, 0x08, 0x00, 0x61,
230+
0x07, 0x00, 0x61, 0x06, 0x00, 0x61, 0x05, 0x00,
231+
0x61, 0x04, 0x00, 0x61, 0x03, 0x00, 0x61, 0x02,
232+
0x00, 0x61, 0x01, 0x00, 0x61, 0x00, 0x00, 0x38,
233+
0x8c, 0x00, 0x00, 0x00, 0x41, 0x09, 0x01, 0x00,
234+
0x00, 0xc9, 0x65, 0x00, 0x00, 0x42, 0x12, 0x01,
235+
0x00, 0x00, 0x62, 0x00, 0x00, 0x04, 0x1f, 0x01,
236+
0x00, 0x00, 0x24, 0x02, 0x00, 0xca, 0x62, 0x01,
237+
0x00, 0x96, 0xea, 0x1b, 0x38, 0x95, 0x00, 0x00,
238+
0x00, 0x11, 0x04, 0x20, 0x01, 0x00, 0x00, 0x42,
239+
0x5d, 0x00, 0x00, 0x00, 0x62, 0x00, 0x00, 0x24,
240+
0x01, 0x00, 0x21, 0x01, 0x00, 0x2f, 0x62, 0x01,
241+
0x00, 0x42, 0x21, 0x01, 0x00, 0x00, 0x65, 0x01,
242+
0x00, 0x41, 0x0d, 0x01, 0x00, 0x00, 0x8c, 0x65,
243+
0x00, 0x00, 0x41, 0x22, 0x01, 0x00, 0x00, 0x24,
244+
0x02, 0x00, 0xcb, 0x62, 0x02, 0x00, 0xb4, 0xa6,
245+
0xea, 0x1c, 0x38, 0x95, 0x00, 0x00, 0x00, 0x11,
246+
0x04, 0x23, 0x01, 0x00, 0x00, 0x42, 0x5d, 0x00,
247+
0x00, 0x00, 0x62, 0x02, 0x00, 0x8c, 0x24, 0x01,
248+
0x00, 0x21, 0x01, 0x00, 0x2f, 0x38, 0xa6, 0x00,
249+
0x00, 0x00, 0x11, 0x65, 0x01, 0x00, 0x41, 0x0d,
250+
0x01, 0x00, 0x00, 0x21, 0x01, 0x00, 0xcc, 0x62,
251+
0x01, 0x00, 0x42, 0x24, 0x01, 0x00, 0x00, 0x62,
252+
0x03, 0x00, 0x41, 0x0b, 0x01, 0x00, 0x00, 0xb4,
253+
0x65, 0x01, 0x00, 0x41, 0x0d, 0x01, 0x00, 0x00,
254+
0x24, 0x03, 0x00, 0x0e, 0x38, 0xa6, 0x00, 0x00,
262255
0x00, 0x11, 0x62, 0x03, 0x00, 0x41, 0x0b, 0x01,
263-
0x00, 0x00, 0x65, 0x01, 0x00, 0x41, 0x0f, 0x01,
264-
0x00, 0x00, 0x65, 0x01, 0x00, 0x41, 0x10, 0x01,
265-
0x00, 0x00, 0x21, 0x03, 0x00, 0xc2, 0x05, 0x62,
266-
0x05, 0x00, 0x42, 0x26, 0x01, 0x00, 0x00, 0xb4,
267-
0x0a, 0x24, 0x02, 0x00, 0xc2, 0x06, 0x38, 0xa6,
268-
0x00, 0x00, 0x00, 0x11, 0x62, 0x06, 0x00, 0x65,
269-
0x01, 0x00, 0x41, 0x0d, 0x01, 0x00, 0x00, 0x9e,
270-
0x21, 0x01, 0x00, 0xc2, 0x07, 0x62, 0x01, 0x00,
271-
0x42, 0x21, 0x01, 0x00, 0x00, 0x62, 0x06, 0x00,
272-
0x65, 0x00, 0x00, 0x41, 0x27, 0x01, 0x00, 0x00,
273-
0x24, 0x02, 0x00, 0x11, 0x63, 0x02, 0x00, 0x0e,
274-
0x62, 0x02, 0x00, 0xb4, 0xa6, 0xea, 0x1c, 0x38,
275-
0x95, 0x00, 0x00, 0x00, 0x11, 0x04, 0x23, 0x01,
276-
0x00, 0x00, 0x42, 0x5d, 0x00, 0x00, 0x00, 0x62,
277-
0x02, 0x00, 0x8c, 0x24, 0x01, 0x00, 0x21, 0x01,
278-
0x00, 0x2f, 0x62, 0x01, 0x00, 0x42, 0x24, 0x01,
256+
0x00, 0x00, 0xb4, 0x65, 0x01, 0x00, 0x41, 0x0f,
257+
0x01, 0x00, 0x00, 0x21, 0x03, 0x00, 0xc2, 0x04,
258+
0xdf, 0x62, 0x04, 0x00, 0xef, 0x65, 0x01, 0x00,
259+
0x41, 0x0e, 0x01, 0x00, 0x00, 0xaf, 0xea, 0x1c,
260+
0x62, 0x01, 0x00, 0x42, 0x18, 0x01, 0x00, 0x00,
261+
0x24, 0x00, 0x00, 0x0e, 0x38, 0x95, 0x00, 0x00,
262+
0x00, 0x11, 0x04, 0x25, 0x01, 0x00, 0x00, 0x21,
263+
0x01, 0x00, 0x2f, 0x38, 0xb0, 0x00, 0x00, 0x00,
264+
0x11, 0x62, 0x03, 0x00, 0x41, 0x0b, 0x01, 0x00,
265+
0x00, 0x65, 0x01, 0x00, 0x41, 0x0f, 0x01, 0x00,
266+
0x00, 0x65, 0x01, 0x00, 0x41, 0x10, 0x01, 0x00,
267+
0x00, 0x21, 0x03, 0x00, 0xc2, 0x05, 0x62, 0x05,
268+
0x00, 0x42, 0x26, 0x01, 0x00, 0x00, 0xb4, 0x0a,
269+
0x24, 0x02, 0x00, 0xc2, 0x06, 0x38, 0xa6, 0x00,
270+
0x00, 0x00, 0x11, 0x62, 0x06, 0x00, 0x65, 0x01,
271+
0x00, 0x41, 0x0d, 0x01, 0x00, 0x00, 0x9e, 0x21,
272+
0x01, 0x00, 0xc2, 0x07, 0x62, 0x01, 0x00, 0x42,
273+
0x21, 0x01, 0x00, 0x00, 0x62, 0x06, 0x00, 0x65,
274+
0x00, 0x00, 0x41, 0x27, 0x01, 0x00, 0x00, 0x24,
275+
0x02, 0x00, 0x11, 0x63, 0x02, 0x00, 0x0e, 0x62,
276+
0x02, 0x00, 0xb4, 0xa6, 0xea, 0x28, 0x62, 0x01,
277+
0x00, 0x42, 0x18, 0x01, 0x00, 0x00, 0x24, 0x00,
278+
0x00, 0x0e, 0x38, 0x95, 0x00, 0x00, 0x00, 0x11,
279+
0x04, 0x23, 0x01, 0x00, 0x00, 0x42, 0x5d, 0x00,
280+
0x00, 0x00, 0x62, 0x02, 0x00, 0x8c, 0x24, 0x01,
281+
0x00, 0x21, 0x01, 0x00, 0x2f, 0x62, 0x01, 0x00,
282+
0x42, 0x24, 0x01, 0x00, 0x00, 0x62, 0x07, 0x00,
283+
0x41, 0x0b, 0x01, 0x00, 0x00, 0xb4, 0x62, 0x07,
284+
0x00, 0xe9, 0x24, 0x03, 0x00, 0x0e, 0x62, 0x01,
285+
0x00, 0x42, 0x28, 0x01, 0x00, 0x00, 0x24, 0x00,
286+
0x00, 0xea, 0x1c, 0x62, 0x01, 0x00, 0x42, 0x18,
287+
0x01, 0x00, 0x00, 0x24, 0x00, 0x00, 0x0e, 0x38,
288+
0x95, 0x00, 0x00, 0x00, 0x11, 0x04, 0x29, 0x01,
289+
0x00, 0x00, 0x21, 0x01, 0x00, 0x2f, 0x62, 0x01,
290+
0x00, 0x42, 0x18, 0x01, 0x00, 0x00, 0x24, 0x00,
291+
0x00, 0x0e, 0x65, 0x03, 0x00, 0x42, 0x24, 0x01,
279292
0x00, 0x00, 0x62, 0x07, 0x00, 0x41, 0x0b, 0x01,
280-
0x00, 0x00, 0xb4, 0x62, 0x07, 0x00, 0xe9, 0x24,
281-
0x03, 0x00, 0x0e, 0x62, 0x01, 0x00, 0x42, 0x28,
282-
0x01, 0x00, 0x00, 0x24, 0x00, 0x00, 0xea, 0x10,
283-
0x38, 0x95, 0x00, 0x00, 0x00, 0x11, 0x04, 0x29,
284-
0x01, 0x00, 0x00, 0x21, 0x01, 0x00, 0x2f, 0x62,
285-
0x01, 0x00, 0x42, 0x19, 0x01, 0x00, 0x00, 0x24,
286-
0x00, 0x00, 0x0e, 0x65, 0x03, 0x00, 0x42, 0x24,
287-
0x01, 0x00, 0x00, 0x62, 0x07, 0x00, 0x41, 0x0b,
288-
0x01, 0x00, 0x00, 0xb4, 0x62, 0x07, 0x00, 0xe9,
289-
0x65, 0x04, 0x00, 0x65, 0x05, 0x00, 0xa4, 0x24,
290-
0x04, 0x00, 0xc2, 0x08, 0x65, 0x00, 0x00, 0x42,
291-
0x05, 0x01, 0x00, 0x00, 0x62, 0x08, 0x00, 0x0b,
292-
0x0a, 0x4c, 0x2a, 0x01, 0x00, 0x00, 0x25, 0x02,
293-
0x00, 0x08, 0xea, 0x16, 0xbf, 0x00, 0x5f, 0x09,
294-
0x00, 0xbf, 0x01, 0x5f, 0x0a, 0x00, 0xbf, 0x02,
295-
0x5f, 0x0b, 0x00, 0xbf, 0x03, 0x5f, 0x0c, 0x00,
296-
0x29, 0xb5, 0xb4, 0x9f, 0xe4, 0xb5, 0xb7, 0x9f,
297-
0x5f, 0x04, 0x00, 0xb5, 0xb4, 0x9f, 0x5f, 0x05,
298-
0x00, 0xb5, 0xb7, 0x9f, 0x5f, 0x06, 0x00, 0xb5,
299-
0xb8, 0x9f, 0x5f, 0x07, 0x00, 0x0b, 0x04, 0x2b,
300-
0x01, 0x00, 0x00, 0x4c, 0x0e, 0x01, 0x00, 0x00,
301-
0xbc, 0x08, 0x4c, 0x0f, 0x01, 0x00, 0x00, 0xb8,
302-
0x4c, 0x10, 0x01, 0x00, 0x00, 0xbc, 0x0c, 0x4c,
303-
0x0d, 0x01, 0x00, 0x00, 0x5f, 0x08, 0x00, 0x06,
304-
0x2e,
293+
0x00, 0x00, 0xb4, 0x62, 0x07, 0x00, 0xe9, 0x65,
294+
0x04, 0x00, 0x65, 0x05, 0x00, 0xa4, 0x24, 0x04,
295+
0x00, 0xc2, 0x08, 0x65, 0x00, 0x00, 0x42, 0x05,
296+
0x01, 0x00, 0x00, 0x62, 0x08, 0x00, 0x0b, 0x0a,
297+
0x4c, 0x2a, 0x01, 0x00, 0x00, 0x25, 0x02, 0x00,
298+
0x08, 0xea, 0x16, 0xbf, 0x00, 0x5f, 0x09, 0x00,
299+
0xbf, 0x01, 0x5f, 0x0a, 0x00, 0xbf, 0x02, 0x5f,
300+
0x0b, 0x00, 0xbf, 0x03, 0x5f, 0x0c, 0x00, 0x29,
301+
0xb5, 0xb4, 0x9f, 0xe4, 0xb5, 0xb7, 0x9f, 0x5f,
302+
0x04, 0x00, 0xb5, 0xb4, 0x9f, 0x5f, 0x05, 0x00,
303+
0xb5, 0xb7, 0x9f, 0x5f, 0x06, 0x00, 0xb5, 0xb8,
304+
0x9f, 0x5f, 0x07, 0x00, 0x0b, 0x04, 0x2b, 0x01,
305+
0x00, 0x00, 0x4c, 0x0e, 0x01, 0x00, 0x00, 0xbc,
306+
0x08, 0x4c, 0x0f, 0x01, 0x00, 0x00, 0xb8, 0x4c,
307+
0x10, 0x01, 0x00, 0x00, 0xbc, 0x0c, 0x4c, 0x0d,
308+
0x01, 0x00, 0x00, 0x5f, 0x08, 0x00, 0x06, 0x2e,
305309
};
306310

‎qjs.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ static BOOL is_standalone(const char *exe)
6464
if (!exe_f)
6565
return FALSE;
6666
if (fseek(exe_f, -trailer_size, SEEK_END) < 0)
67-
return FALSE;
67+
goto fail;
6868
uint8_t buf[TRAILER_SIZE];
6969
if (fread(buf, 1, trailer_size, exe_f) != trailer_size)
70-
return FALSE;
70+
goto fail;
7171
fclose(exe_f);
72-
7372
return !memcmp(buf, trailer_magic, trailer_magic_size);
73+
fail:
74+
fclose(exe_f);
75+
return FALSE;
7476
}
7577

7678
static JSValue load_standalone_module(JSContext *ctx)
@@ -468,7 +470,7 @@ int main(int argc, char **argv)
468470
if (!opt_arg) {
469471
if (optind >= argc) {
470472
fprintf(stderr, "qjs: missing expression for -e\n");
471-
exit(2);
473+
exit(1);
472474
}
473475
opt_arg = argv[optind++];
474476
}
@@ -549,7 +551,7 @@ int main(int argc, char **argv)
549551
if (!opt_arg) {
550552
if (optind >= argc) {
551553
fprintf(stderr, "qjs: missing file for -c\n");
552-
exit(2);
554+
exit(1);
553555
}
554556
opt_arg = argv[optind++];
555557
}
@@ -560,7 +562,7 @@ int main(int argc, char **argv)
560562
if (!opt_arg) {
561563
if (optind >= argc) {
562564
fprintf(stderr, "qjs: missing file for -o\n");
563-
exit(2);
565+
exit(1);
564566
}
565567
opt_arg = argv[optind++];
566568
}
@@ -571,7 +573,7 @@ int main(int argc, char **argv)
571573
if (!opt_arg) {
572574
if (optind >= argc) {
573575
fprintf(stderr, "qjs: missing file for --exe\n");
574-
exit(2);
576+
exit(1);
575577
}
576578
opt_arg = argv[optind++];
577579
}

‎standalone.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export function compileStandalone(inFile, outFile, targetExe) {
6767
throw new Error(`failed to create ${outFile}`);
6868
}
6969
if (os.write(newFd, newBuffer, 0, newBuffer.byteLength) < 0) {
70+
os.close(newFd);
7071
throw new Error(`failed to write to output file`);
7172
}
7273
os.close(newFd);
@@ -103,11 +104,13 @@ export function runStandalone() {
103104

104105
r = exe.seek(offset, std.SEEK_SET);
105106
if (r < 0) {
107+
exe.close();
106108
throw new Error(`seek error: ${-r}`);
107109
}
108110

109111
exe.read(bytecode.buffer, 0, bytecode.length);
110112
if (exe.error()) {
113+
exe.close();
111114
throw new Error('read error');
112115
}
113116
exe.close();

0 commit comments

Comments
 (0)