]>
Commit | Line | Data |
---|---|---|
7d658874 | 1 | /* |
50985c20 | 2 | * This file is part of the libsigrok project. |
7d658874 | 3 | * |
13d8e03c | 4 | * Copyright (C) 2013 Bert Vermeulen <bert@biot.com> |
7d658874 BV |
5 | * |
6 | * This program is free software: you can redistribute it and/or modify | |
7 | * it under the terms of the GNU General Public License as published by | |
8 | * the Free Software Foundation, either version 3 of the License, or | |
9 | * (at your option) any later version. | |
10 | * | |
11 | * This program is distributed in the hope that it will be useful, | |
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 | * GNU General Public License for more details. | |
15 | * | |
16 | * You should have received a copy of the GNU General Public License | |
17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
18 | */ | |
19 | ||
20 | #include <string.h> | |
21 | #include <stdlib.h> | |
22 | #include <unistd.h> | |
23 | #include <zip.h> | |
5f9c4c8a BV |
24 | #include <sys/types.h> |
25 | #include <sys/stat.h> | |
26 | #include <errno.h> | |
7d658874 | 27 | #include <glib.h> |
3bbd9849 | 28 | #include <glib/gstdio.h> |
545f9786 | 29 | #include "config.h" /* Needed for PACKAGE_VERSION and others. */ |
45c59c8b BV |
30 | #include "libsigrok.h" |
31 | #include "libsigrok-internal.h" | |
7d658874 | 32 | |
2ad1deb8 | 33 | /** @cond PRIVATE */ |
3544f848 | 34 | #define LOG_PREFIX "session-file" |
2ad1deb8 | 35 | /** @endcond */ |
a885ce3e | 36 | |
393fb9cb UH |
37 | /** |
38 | * @file | |
39 | * | |
40 | * Loading and saving libsigrok session files. | |
41 | */ | |
42 | ||
7b870c38 | 43 | /** |
777e2035 | 44 | * @addtogroup grp_session |
7b870c38 UH |
45 | * |
46 | * @{ | |
47 | */ | |
48 | ||
2872d21e | 49 | extern struct sr_session *session; |
c09f0b57 | 50 | extern SR_PRIV struct sr_dev_driver session_driver; |
7d658874 | 51 | |
72a08bcc | 52 | /** @private */ |
f438e0c9 | 53 | SR_PRIV int sr_sessionfile_check(const char *filename) |
7d658874 | 54 | { |
5f9c4c8a | 55 | struct stat st; |
7d658874 BV |
56 | struct zip *archive; |
57 | struct zip_file *zf; | |
58 | struct zip_stat zs; | |
f438e0c9 BV |
59 | int version, ret; |
60 | char s[11]; | |
7d658874 | 61 | |
f438e0c9 | 62 | if (!filename) |
9f45fb3a | 63 | return SR_ERR_ARG; |
9f45fb3a | 64 | |
5f9c4c8a BV |
65 | if (stat(filename, &st) == -1) { |
66 | sr_err("Couldn't stat %s: %s", filename, strerror(errno)); | |
67 | return SR_ERR; | |
68 | } | |
69 | ||
f438e0c9 BV |
70 | if (!(archive = zip_open(filename, 0, &ret))) |
71 | /* No logging: this can be used just to check if it's | |
72 | * a sigrok session file or not. */ | |
7d658874 | 73 | return SR_ERR; |
7d658874 BV |
74 | |
75 | /* check "version" */ | |
c1864d55 | 76 | version = 0; |
7d658874 | 77 | if (!(zf = zip_fopen(archive, "version", 0))) { |
f438e0c9 | 78 | sr_dbg("Not a sigrok session file: no version found."); |
7d658874 BV |
79 | return SR_ERR; |
80 | } | |
f438e0c9 | 81 | if ((ret = zip_fread(zf, s, 10)) == -1) |
7d658874 | 82 | return SR_ERR; |
7d658874 | 83 | zip_fclose(zf); |
c1864d55 BV |
84 | s[ret] = 0; |
85 | version = strtoull(s, NULL, 10); | |
3a841040 | 86 | if (version > 2) { |
f438e0c9 | 87 | sr_dbg("Cannot handle sigrok session file version %d.", version); |
c1864d55 BV |
88 | return SR_ERR; |
89 | } | |
3a841040 | 90 | sr_spew("Detected sigrok session file version %d.", version); |
7d658874 BV |
91 | |
92 | /* read "metadata" */ | |
93 | if (zip_stat(archive, "metadata", 0, &zs) == -1) { | |
a885ce3e | 94 | sr_dbg("Not a valid sigrok session file."); |
7d658874 BV |
95 | return SR_ERR; |
96 | } | |
b53738ba | 97 | |
f438e0c9 BV |
98 | return SR_OK; |
99 | } | |
100 | ||
101 | /** | |
102 | * Load the session from the specified filename. | |
103 | * | |
104 | * @param filename The name of the session file to load. Must not be NULL. | |
105 | * | |
106 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, | |
107 | * SR_ERR_MALLOC upon memory allocation errors, or SR_ERR upon | |
108 | * other errors. | |
109 | */ | |
0812c40e | 110 | SR_API int sr_session_load(const char *filename, struct sr_session **session) |
f438e0c9 BV |
111 | { |
112 | GKeyFile *kf; | |
113 | GPtrArray *capturefiles; | |
114 | struct zip *archive; | |
115 | struct zip_file *zf; | |
116 | struct zip_stat zs; | |
117 | struct sr_dev_inst *sdi; | |
ba7dd8bb | 118 | struct sr_channel *ch; |
9f00e5ae | 119 | int devcnt, ret, i, j; |
ba7dd8bb | 120 | uint64_t tmp_u64, total_channels, enabled_channels, p; |
f438e0c9 | 121 | char **sections, **keys, *metafile, *val; |
3f239f08 | 122 | char channelname[SR_MAX_CHANNELNAME_LEN + 1]; |
f438e0c9 BV |
123 | |
124 | if ((ret = sr_sessionfile_check(filename)) != SR_OK) | |
125 | return ret; | |
126 | ||
127 | if (!(archive = zip_open(filename, 0, &ret))) | |
128 | return SR_ERR; | |
129 | ||
130 | if (zip_stat(archive, "metadata", 0, &zs) == -1) | |
131 | return SR_ERR; | |
132 | ||
b53738ba | 133 | if (!(metafile = g_try_malloc(zs.size))) { |
a885ce3e | 134 | sr_err("%s: metafile malloc failed", __func__); |
b53738ba UH |
135 | return SR_ERR_MALLOC; |
136 | } | |
137 | ||
7d658874 BV |
138 | zf = zip_fopen_index(archive, zs.index, 0); |
139 | zip_fread(zf, metafile, zs.size); | |
140 | zip_fclose(zf); | |
141 | ||
142 | kf = g_key_file_new(); | |
143 | if (!g_key_file_load_from_data(kf, metafile, zs.size, 0, NULL)) { | |
a885ce3e | 144 | sr_dbg("Failed to parse metadata."); |
7d658874 BV |
145 | return SR_ERR; |
146 | } | |
147 | ||
0812c40e ML |
148 | if ((ret = sr_session_new(session)) != SR_OK) |
149 | return ret; | |
7d658874 BV |
150 | |
151 | devcnt = 0; | |
152 | capturefiles = g_ptr_array_new_with_free_func(g_free); | |
153 | sections = g_key_file_get_groups(kf, NULL); | |
154 | for (i = 0; sections[i]; i++) { | |
155 | if (!strcmp(sections[i], "global")) | |
156 | /* nothing really interesting in here yet */ | |
157 | continue; | |
158 | if (!strncmp(sections[i], "device ", 7)) { | |
159 | /* device section */ | |
4d684427 | 160 | sdi = NULL; |
ba7dd8bb | 161 | enabled_channels = total_channels = 0; |
7d658874 BV |
162 | keys = g_key_file_get_keys(kf, sections[i], NULL, NULL); |
163 | for (j = 0; keys[j]; j++) { | |
164 | val = g_key_file_get_string(kf, sections[i], keys[j], NULL); | |
165 | if (!strcmp(keys[j], "capturefile")) { | |
4d684427 BV |
166 | sdi = sr_dev_inst_new(devcnt, SR_ST_ACTIVE, NULL, NULL, NULL); |
167 | sdi->driver = &session_driver; | |
7d658874 | 168 | if (devcnt == 0) |
c09f0b57 | 169 | /* first device, init the driver */ |
44fc870c | 170 | sdi->driver->init(NULL); |
bd7bfe8c | 171 | sr_dev_open(sdi); |
0812c40e | 172 | sr_session_dev_add(*session, sdi); |
003595ac | 173 | sdi->driver->config_set(SR_CONF_SESSIONFILE, |
8f996b89 | 174 | g_variant_new_string(filename), sdi, NULL); |
003595ac | 175 | sdi->driver->config_set(SR_CONF_CAPTUREFILE, |
8f996b89 | 176 | g_variant_new_string(val), sdi, NULL); |
7d658874 BV |
177 | g_ptr_array_add(capturefiles, val); |
178 | } else if (!strcmp(keys[j], "samplerate")) { | |
f64c1414 | 179 | sr_parse_sizestring(val, &tmp_u64); |
003595ac | 180 | sdi->driver->config_set(SR_CONF_SAMPLERATE, |
8f996b89 | 181 | g_variant_new_uint64(tmp_u64), sdi, NULL); |
7d658874 BV |
182 | } else if (!strcmp(keys[j], "unitsize")) { |
183 | tmp_u64 = strtoull(val, NULL, 10); | |
003595ac | 184 | sdi->driver->config_set(SR_CONF_CAPTURE_UNITSIZE, |
8f996b89 | 185 | g_variant_new_uint64(tmp_u64), sdi, NULL); |
7d658874 | 186 | } else if (!strcmp(keys[j], "total probes")) { |
ba7dd8bb | 187 | total_channels = strtoull(val, NULL, 10); |
3f239f08 | 188 | sdi->driver->config_set(SR_CONF_NUM_LOGIC_CHANNELS, |
ba7dd8bb UH |
189 | g_variant_new_uint64(total_channels), sdi, NULL); |
190 | for (p = 0; p < total_channels; p++) { | |
3f239f08 UH |
191 | snprintf(channelname, SR_MAX_CHANNELNAME_LEN, "%" PRIu64, p); |
192 | if (!(ch = sr_channel_new(p, SR_CHANNEL_LOGIC, TRUE, | |
ba7dd8bb | 193 | channelname))) |
4d684427 | 194 | return SR_ERR; |
ba7dd8bb | 195 | sdi->channels = g_slist_append(sdi->channels, ch); |
464d12c7 | 196 | } |
7d658874 | 197 | } else if (!strncmp(keys[j], "probe", 5)) { |
4d684427 | 198 | if (!sdi) |
7d658874 | 199 | continue; |
ba7dd8bb | 200 | enabled_channels++; |
7d658874 | 201 | tmp_u64 = strtoul(keys[j]+5, NULL, 10); |
fb381e4d | 202 | /* sr_session_save() */ |
f3ca73ed | 203 | sr_dev_channel_name_set(sdi, tmp_u64 - 1, val); |
7d658874 BV |
204 | } |
205 | } | |
206 | g_strfreev(keys); | |
ba7dd8bb UH |
207 | /* Disable channels not specifically listed. */ |
208 | if (total_channels) | |
209 | for (p = enabled_channels; p < total_channels; p++) | |
f3ca73ed | 210 | sr_dev_channel_enable(sdi, p, FALSE); |
7d658874 | 211 | } |
4d684427 | 212 | devcnt++; |
7d658874 BV |
213 | } |
214 | g_strfreev(sections); | |
215 | g_key_file_free(kf); | |
216 | ||
217 | return SR_OK; | |
218 | } | |
219 | ||
9f45fb3a | 220 | /** |
0812c40e | 221 | * Save a session to the specified file. |
9f45fb3a | 222 | * |
0812c40e | 223 | * @param filename The name of the filename to save the session as. |
9f45fb3a | 224 | * Must not be NULL. |
056be071 | 225 | * @param sdi The device instance from which the data was captured. |
18bc2704 BV |
226 | * @param buf The data to be saved. |
227 | * @param unitsize The number of bytes per sample. | |
228 | * @param units The number of samples. | |
9f45fb3a | 229 | * |
a769b9f3 BV |
230 | * @retval SR_OK Success |
231 | * @retval SR_ERR_ARG Invalid arguments | |
232 | * @retval SR_ERR Other errors | |
47117241 UH |
233 | * |
234 | * @since 0.2.0 | |
9f45fb3a | 235 | */ |
0812c40e ML |
236 | SR_API int sr_session_save(struct sr_session *session, const char *filename, |
237 | const struct sr_dev_inst *sdi, unsigned char *buf, int unitsize, | |
238 | int units) | |
7d658874 | 239 | { |
ba7dd8bb | 240 | struct sr_channel *ch; |
18bc2704 | 241 | GSList *l; |
003595ac | 242 | GVariant *gvar; |
a769b9f3 BV |
243 | uint64_t samplerate; |
244 | int cnt, ret; | |
ba7dd8bb | 245 | char **channel_names; |
a769b9f3 BV |
246 | |
247 | samplerate = 0; | |
248 | if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) { | |
249 | if (sr_config_get(sdi->driver, sdi, NULL, | |
250 | SR_CONF_SAMPLERATE, &gvar) == SR_OK) { | |
251 | samplerate = g_variant_get_uint64(gvar); | |
252 | g_variant_unref(gvar); | |
253 | } | |
254 | } | |
255 | ||
ba7dd8bb | 256 | channel_names = g_malloc0(sizeof(char *) * (g_slist_length(sdi->channels) + 1)); |
a769b9f3 | 257 | cnt = 0; |
ba7dd8bb UH |
258 | for (l = sdi->channels; l; l = l->next) { |
259 | ch = l->data; | |
3f239f08 | 260 | if (ch->type != SR_CHANNEL_LOGIC) |
eca2f852 | 261 | continue; |
ba7dd8bb | 262 | if (ch->enabled != TRUE) |
eca2f852 | 263 | continue; |
ba7dd8bb | 264 | if (!ch->name) |
eca2f852 BV |
265 | continue; |
266 | /* Just borrowing the ptr. */ | |
ba7dd8bb | 267 | channel_names[cnt++] = ch->name; |
a769b9f3 BV |
268 | } |
269 | ||
0812c40e ML |
270 | if ((ret = sr_session_save_init(session, filename, samplerate, |
271 | channel_names)) != SR_OK) | |
a769b9f3 BV |
272 | return ret; |
273 | ||
0812c40e | 274 | ret = sr_session_append(session, filename, buf, unitsize, units); |
a769b9f3 BV |
275 | |
276 | return ret; | |
277 | } | |
278 | ||
279 | /** | |
280 | * Initialize a saved session file. | |
281 | * | |
0812c40e | 282 | * @param filename The name of the filename to save the session as. |
a769b9f3 BV |
283 | * Must not be NULL. |
284 | * @param samplerate The samplerate to store for this session. | |
ba7dd8bb UH |
285 | * @param channels A NULL-terminated array of strings containing the names |
286 | * of all the channels active in this session. | |
a769b9f3 BV |
287 | * |
288 | * @retval SR_OK Success | |
289 | * @retval SR_ERR_ARG Invalid arguments | |
290 | * @retval SR_ERR Other errors | |
47117241 UH |
291 | * |
292 | * @since 0.3.0 | |
a769b9f3 | 293 | */ |
0812c40e ML |
294 | SR_API int sr_session_save_init(struct sr_session *session, |
295 | const char *filename, uint64_t samplerate, char **channels) | |
a769b9f3 | 296 | { |
7d658874 | 297 | FILE *meta; |
7d658874 | 298 | struct zip *zipfile; |
a769b9f3 BV |
299 | struct zip_source *versrc, *metasrc; |
300 | int tmpfile, cnt, ret, i; | |
301 | char version[1], metafile[32], *s; | |
7d658874 | 302 | |
f4d2042d | 303 | (void)session; |
0812c40e | 304 | |
9f45fb3a | 305 | if (!filename) { |
a885ce3e | 306 | sr_err("%s: filename was NULL", __func__); |
9f45fb3a UH |
307 | return SR_ERR_ARG; |
308 | } | |
309 | ||
7d658874 | 310 | /* Quietly delete it first, libzip wants replace ops otherwise. */ |
4a1b18f8 | 311 | unlink(filename); |
ebc34738 | 312 | if (!(zipfile = zip_open(filename, ZIP_CREATE, &ret))) |
7d658874 | 313 | return SR_ERR; |
7d658874 BV |
314 | |
315 | /* "version" */ | |
3a841040 | 316 | version[0] = '2'; |
7d658874 BV |
317 | if (!(versrc = zip_source_buffer(zipfile, version, 1, 0))) |
318 | return SR_ERR; | |
319 | if (zip_add(zipfile, "version", versrc) == -1) { | |
a885ce3e | 320 | sr_info("error saving version into zipfile: %s", |
b08024a8 | 321 | zip_strerror(zipfile)); |
7d658874 BV |
322 | return SR_ERR; |
323 | } | |
324 | ||
325 | /* init "metadata" */ | |
326 | strcpy(metafile, "sigrok-meta-XXXXXX"); | |
327 | if ((tmpfile = g_mkstemp(metafile)) == -1) | |
328 | return SR_ERR; | |
329 | close(tmpfile); | |
868d8cef | 330 | meta = g_fopen(metafile, "wb"); |
7d658874 BV |
331 | fprintf(meta, "[global]\n"); |
332 | fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION); | |
7d658874 | 333 | |
056be071 BV |
334 | /* metadata */ |
335 | fprintf(meta, "[device 1]\n"); | |
7d658874 | 336 | |
056be071 BV |
337 | /* metadata */ |
338 | fprintf(meta, "capturefile = logic-1\n"); | |
a769b9f3 | 339 | cnt = 0; |
ba7dd8bb | 340 | for (i = 0; channels[i]; i++) |
a769b9f3 BV |
341 | cnt++; |
342 | fprintf(meta, "total probes = %d\n", cnt); | |
343 | s = sr_samplerate_string(samplerate); | |
344 | fprintf(meta, "samplerate = %s\n", s); | |
345 | g_free(s); | |
346 | ||
ba7dd8bb UH |
347 | for (i = 0; channels[i]; i++) |
348 | fprintf(meta, "probe%d = %s\n", i + 1, channels[i]); | |
7d658874 | 349 | |
7d658874 BV |
350 | fclose(meta); |
351 | ||
d2cd06e7 BV |
352 | if (!(metasrc = zip_source_file(zipfile, metafile, 0, -1))) { |
353 | unlink(metafile); | |
7d658874 | 354 | return SR_ERR; |
d2cd06e7 BV |
355 | } |
356 | if (zip_add(zipfile, "metadata", metasrc) == -1) { | |
357 | unlink(metafile); | |
7d658874 | 358 | return SR_ERR; |
d2cd06e7 | 359 | } |
7d658874 BV |
360 | |
361 | if ((ret = zip_close(zipfile)) == -1) { | |
a885ce3e | 362 | sr_info("error saving zipfile: %s", zip_strerror(zipfile)); |
d2cd06e7 | 363 | unlink(metafile); |
7d658874 BV |
364 | return SR_ERR; |
365 | } | |
366 | ||
367 | unlink(metafile); | |
368 | ||
369 | return SR_OK; | |
370 | } | |
7b870c38 | 371 | |
f438e0c9 BV |
372 | /** |
373 | * Append data to an existing session file. | |
374 | * | |
a769b9f3 BV |
375 | * The session file must have been created with sr_session_save_init() |
376 | * or sr_session_save() beforehand. | |
377 | * | |
f438e0c9 BV |
378 | * @param filename The name of the filename to append to. Must not be NULL. |
379 | * @param buf The data to be appended. | |
380 | * @param unitsize The number of bytes per sample. | |
381 | * @param units The number of samples. | |
382 | * | |
a769b9f3 BV |
383 | * @retval SR_OK Success |
384 | * @retval SR_ERR_ARG Invalid arguments | |
385 | * @retval SR_ERR Other errors | |
47117241 UH |
386 | * |
387 | * @since 0.3.0 | |
f438e0c9 | 388 | */ |
0812c40e ML |
389 | SR_API int sr_session_append(struct sr_session *session, const char *filename, |
390 | unsigned char *buf, int unitsize, int units) | |
f438e0c9 BV |
391 | { |
392 | struct zip *archive; | |
393 | struct zip_source *logicsrc; | |
394 | zip_int64_t num_files; | |
a769b9f3 BV |
395 | struct zip_file *zf; |
396 | struct zip_stat zs; | |
397 | struct zip_source *metasrc; | |
398 | GKeyFile *kf; | |
399 | GError *error; | |
400 | gsize len; | |
401 | int chunk_num, next_chunk_num, tmpfile, ret, i; | |
f438e0c9 | 402 | const char *entry_name; |
a769b9f3 | 403 | char *metafile, tmpname[32], chunkname[16]; |
f438e0c9 | 404 | |
f4d2042d | 405 | (void)session; |
0812c40e | 406 | |
f438e0c9 BV |
407 | if ((ret = sr_sessionfile_check(filename)) != SR_OK) |
408 | return ret; | |
409 | ||
410 | if (!(archive = zip_open(filename, 0, &ret))) | |
411 | return SR_ERR; | |
412 | ||
a769b9f3 BV |
413 | if (zip_stat(archive, "metadata", 0, &zs) == -1) |
414 | return SR_ERR; | |
415 | ||
416 | metafile = g_malloc(zs.size); | |
417 | zf = zip_fopen_index(archive, zs.index, 0); | |
418 | zip_fread(zf, metafile, zs.size); | |
419 | zip_fclose(zf); | |
420 | ||
421 | /* | |
422 | * If the file was only initialized but doesn't yet have any | |
423 | * data it in, it won't have a unitsize field in metadata yet. | |
424 | */ | |
425 | error = NULL; | |
426 | kf = g_key_file_new(); | |
427 | if (!g_key_file_load_from_data(kf, metafile, zs.size, 0, &error)) { | |
428 | sr_err("Failed to parse metadata: %s.", error->message); | |
429 | return SR_ERR; | |
430 | } | |
431 | g_free(metafile); | |
d2cd06e7 | 432 | tmpname[0] = '\0'; |
a769b9f3 BV |
433 | if (!g_key_file_has_key(kf, "device 1", "unitsize", &error)) { |
434 | if (error && error->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND) { | |
435 | sr_err("Failed to check unitsize key: %s", error ? error->message : "?"); | |
436 | return SR_ERR; | |
437 | } | |
438 | /* Add unitsize field. */ | |
439 | g_key_file_set_integer(kf, "device 1", "unitsize", unitsize); | |
440 | metafile = g_key_file_to_data(kf, &len, &error); | |
441 | strcpy(tmpname, "sigrok-meta-XXXXXX"); | |
442 | if ((tmpfile = g_mkstemp(tmpname)) == -1) | |
443 | return SR_ERR; | |
444 | if (write(tmpfile, metafile, len) < 0) { | |
445 | sr_dbg("Failed to create new metadata: %s", strerror(errno)); | |
d2cd06e7 BV |
446 | g_free(metafile); |
447 | unlink(tmpname); | |
a769b9f3 BV |
448 | return SR_ERR; |
449 | } | |
450 | close(tmpfile); | |
451 | if (!(metasrc = zip_source_file(archive, tmpname, 0, -1))) { | |
a769b9f3 | 452 | sr_err("Failed to create zip source for metadata."); |
d2cd06e7 BV |
453 | g_free(metafile); |
454 | unlink(tmpname); | |
a769b9f3 BV |
455 | return SR_ERR; |
456 | } | |
457 | if (zip_replace(archive, zs.index, metasrc) == -1) { | |
458 | sr_err("Failed to replace metadata file."); | |
d2cd06e7 BV |
459 | g_free(metafile); |
460 | unlink(tmpname); | |
a769b9f3 BV |
461 | return SR_ERR; |
462 | } | |
463 | g_free(metafile); | |
464 | } | |
465 | g_key_file_free(kf); | |
466 | ||
f438e0c9 BV |
467 | next_chunk_num = 1; |
468 | num_files = zip_get_num_entries(archive, 0); | |
469 | for (i = 0; i < num_files; i++) { | |
470 | entry_name = zip_get_name(archive, i, 0); | |
471 | if (strncmp(entry_name, "logic-1", 7)) | |
472 | continue; | |
473 | if (strlen(entry_name) == 7) { | |
474 | /* This file has no extra chunks, just a single "logic-1". | |
475 | * Rename it to "logic-1-1" * and continue with chunk 2. */ | |
476 | if (zip_rename(archive, i, "logic-1-1") == -1) { | |
477 | sr_err("Failed to rename 'logic-1' to 'logic-1-1'."); | |
d2cd06e7 | 478 | unlink(tmpname); |
f438e0c9 BV |
479 | return SR_ERR; |
480 | } | |
481 | next_chunk_num = 2; | |
482 | break; | |
483 | } else if (strlen(entry_name) > 8 && entry_name[7] == '-') { | |
484 | chunk_num = strtoull(entry_name + 8, NULL, 10); | |
485 | if (chunk_num >= next_chunk_num) | |
486 | next_chunk_num = chunk_num + 1; | |
487 | } | |
488 | } | |
489 | snprintf(chunkname, 15, "logic-1-%d", next_chunk_num); | |
d2cd06e7 BV |
490 | if (!(logicsrc = zip_source_buffer(archive, buf, units * unitsize, FALSE))) { |
491 | unlink(tmpname); | |
f438e0c9 | 492 | return SR_ERR; |
d2cd06e7 BV |
493 | } |
494 | if (zip_add(archive, chunkname, logicsrc) == -1) { | |
495 | unlink(tmpname); | |
f438e0c9 | 496 | return SR_ERR; |
d2cd06e7 | 497 | } |
f438e0c9 BV |
498 | if ((ret = zip_close(archive)) == -1) { |
499 | sr_info("error saving session file: %s", zip_strerror(archive)); | |
d2cd06e7 | 500 | unlink(tmpname); |
f438e0c9 BV |
501 | return SR_ERR; |
502 | } | |
d2cd06e7 | 503 | unlink(tmpname); |
f438e0c9 BV |
504 | |
505 | return SR_OK; | |
506 | } | |
507 | ||
7b870c38 | 508 | /** @} */ |