Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 1 | /* |
Uwe Hermann | 50985c2 | 2013-04-23 22:24:30 +0200 | [diff] [blame] | 2 | * This file is part of the libsigrok project. |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 3 | * |
Bert Vermeulen | 13d8e03 | 2013-03-24 11:21:00 +0100 | [diff] [blame] | 4 | * Copyright (C) 2013 Bert Vermeulen <bert@biot.com> |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 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> |
| 24 | #include <glib.h> |
Uwe Hermann | 3bbd984 | 2011-02-06 02:14:57 +0100 | [diff] [blame] | 25 | #include <glib/gstdio.h> |
Uwe Hermann | 545f978 | 2012-10-24 00:41:21 +0200 | [diff] [blame] | 26 | #include "config.h" /* Needed for PACKAGE_VERSION and others. */ |
Bert Vermeulen | 45c59c8 | 2012-07-05 00:55:07 +0200 | [diff] [blame] | 27 | #include "libsigrok.h" |
| 28 | #include "libsigrok-internal.h" |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 29 | |
Uwe Hermann | 29a2719 | 2013-05-03 21:59:32 +0200 | [diff] [blame] | 30 | /* Message logging helpers with subsystem-specific prefix string. */ |
| 31 | #define LOG_PREFIX "session-file: " |
| 32 | #define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) |
| 33 | #define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) |
| 34 | #define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) |
| 35 | #define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) |
| 36 | #define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) |
| 37 | #define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args) |
Uwe Hermann | a885ce3 | 2012-11-11 12:44:16 +0100 | [diff] [blame] | 38 | |
Uwe Hermann | 7b870c3 | 2012-10-21 16:13:36 +0200 | [diff] [blame] | 39 | /** |
Uwe Hermann | 393fb9c | 2012-10-22 00:30:12 +0200 | [diff] [blame] | 40 | * @file |
| 41 | * |
| 42 | * Loading and saving libsigrok session files. |
| 43 | */ |
| 44 | |
| 45 | /** |
Uwe Hermann | 777e203 | 2012-10-21 23:43:41 +0200 | [diff] [blame] | 46 | * @addtogroup grp_session |
Uwe Hermann | 7b870c3 | 2012-10-21 16:13:36 +0200 | [diff] [blame] | 47 | * |
| 48 | * @{ |
| 49 | */ |
| 50 | |
Uwe Hermann | 2872d21 | 2011-02-08 17:50:29 +0100 | [diff] [blame] | 51 | extern struct sr_session *session; |
Uwe Hermann | c09f0b5 | 2012-02-28 23:52:30 +0100 | [diff] [blame] | 52 | extern SR_PRIV struct sr_dev_driver session_driver; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 53 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 54 | /** |
| 55 | * Load the session from the specified filename. |
| 56 | * |
| 57 | * @param filename The name of the session file to load. Must not be NULL. |
| 58 | * |
| 59 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, |
| 60 | * SR_ERR_MALLOC upon memory allocation errors, or SR_ERR upon |
| 61 | * other errors. |
| 62 | */ |
Uwe Hermann | 1a081ca | 2012-02-01 23:40:35 +0100 | [diff] [blame] | 63 | SR_API int sr_session_load(const char *filename) |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 64 | { |
| 65 | GKeyFile *kf; |
| 66 | GPtrArray *capturefiles; |
| 67 | struct zip *archive; |
| 68 | struct zip_file *zf; |
| 69 | struct zip_stat zs; |
Bert Vermeulen | 4d68442 | 2012-07-22 12:18:34 +0200 | [diff] [blame] | 70 | struct sr_dev_inst *sdi; |
Uwe Hermann | 1afe898 | 2011-02-08 17:47:38 +0100 | [diff] [blame] | 71 | struct sr_probe *probe; |
Bert Vermeulen | c1864d5 | 2012-07-23 15:08:44 +0200 | [diff] [blame] | 72 | int ret, probenum, devcnt, version, i, j; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 73 | uint64_t tmp_u64, total_probes, enabled_probes, p; |
Bert Vermeulen | c1864d5 | 2012-07-23 15:08:44 +0200 | [diff] [blame] | 74 | char **sections, **keys, *metafile, *val, s[11]; |
Uwe Hermann | c37d2b1 | 2011-12-29 19:50:14 +0100 | [diff] [blame] | 75 | char probename[SR_MAX_PROBENAME_LEN + 1]; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 76 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 77 | if (!filename) { |
Uwe Hermann | a885ce3 | 2012-11-11 12:44:16 +0100 | [diff] [blame] | 78 | sr_err("%s: filename was NULL", __func__); |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 79 | return SR_ERR_ARG; |
| 80 | } |
| 81 | |
Uwe Hermann | ebc3473 | 2012-03-20 17:51:18 +0100 | [diff] [blame] | 82 | if (!(archive = zip_open(filename, 0, &ret))) { |
Uwe Hermann | a885ce3 | 2012-11-11 12:44:16 +0100 | [diff] [blame] | 83 | sr_dbg("Failed to open session file: zip error %d", ret); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 84 | return SR_ERR; |
| 85 | } |
| 86 | |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 87 | /* read "metadata" */ |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 88 | if (zip_stat(archive, "header", 0, &zs) == -1) { |
| 89 | sr_dbg("Not a valid DSLogic session file."); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 90 | return SR_ERR; |
| 91 | } |
Uwe Hermann | b53738b | 2011-04-16 14:17:51 +0200 | [diff] [blame] | 92 | |
| 93 | if (!(metafile = g_try_malloc(zs.size))) { |
Uwe Hermann | a885ce3 | 2012-11-11 12:44:16 +0100 | [diff] [blame] | 94 | sr_err("%s: metafile malloc failed", __func__); |
Uwe Hermann | b53738b | 2011-04-16 14:17:51 +0200 | [diff] [blame] | 95 | return SR_ERR_MALLOC; |
| 96 | } |
| 97 | |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 98 | zf = zip_fopen_index(archive, zs.index, 0); |
| 99 | zip_fread(zf, metafile, zs.size); |
| 100 | zip_fclose(zf); |
| 101 | |
| 102 | kf = g_key_file_new(); |
| 103 | if (!g_key_file_load_from_data(kf, metafile, zs.size, 0, NULL)) { |
Uwe Hermann | a885ce3 | 2012-11-11 12:44:16 +0100 | [diff] [blame] | 104 | sr_dbg("Failed to parse metadata."); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 105 | return SR_ERR; |
| 106 | } |
| 107 | |
Bert Vermeulen | 2285cf9 | 2012-02-28 17:47:02 +0100 | [diff] [blame] | 108 | sr_session_new(); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 109 | |
| 110 | devcnt = 0; |
| 111 | capturefiles = g_ptr_array_new_with_free_func(g_free); |
| 112 | sections = g_key_file_get_groups(kf, NULL); |
| 113 | for (i = 0; sections[i]; i++) { |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 114 | if (!strcmp(sections[i], "version")) |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 115 | /* nothing really interesting in here yet */ |
| 116 | continue; |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 117 | if (!strncmp(sections[i], "header", 6)) { |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 118 | /* device section */ |
Bert Vermeulen | 4d68442 | 2012-07-22 12:18:34 +0200 | [diff] [blame] | 119 | sdi = NULL; |
Bert Vermeulen | 003595a | 2013-03-25 20:21:10 +0100 | [diff] [blame] | 120 | enabled_probes = total_probes = 0; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 121 | keys = g_key_file_get_keys(kf, sections[i], NULL, NULL); |
| 122 | for (j = 0; keys[j]; j++) { |
| 123 | val = g_key_file_get_string(kf, sections[i], keys[j], NULL); |
| 124 | if (!strcmp(keys[j], "capturefile")) { |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 125 | sdi = sr_dev_inst_new(LOGIC, devcnt, SR_ST_ACTIVE, NULL, NULL, NULL); |
Bert Vermeulen | 4d68442 | 2012-07-22 12:18:34 +0200 | [diff] [blame] | 126 | sdi->driver = &session_driver; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 127 | if (devcnt == 0) |
Uwe Hermann | c09f0b5 | 2012-02-28 23:52:30 +0100 | [diff] [blame] | 128 | /* first device, init the driver */ |
Peter Stuge | 44fc870 | 2012-12-03 02:42:57 +0100 | [diff] [blame] | 129 | sdi->driver->init(NULL); |
Bert Vermeulen | bd7bfe8 | 2013-04-24 23:06:50 +0200 | [diff] [blame] | 130 | sr_dev_open(sdi); |
Bert Vermeulen | 4d68442 | 2012-07-22 12:18:34 +0200 | [diff] [blame] | 131 | sr_session_dev_add(sdi); |
Bert Vermeulen | 003595a | 2013-03-25 20:21:10 +0100 | [diff] [blame] | 132 | sdi->driver->config_set(SR_CONF_SESSIONFILE, |
| 133 | g_variant_new_string(filename), sdi); |
| 134 | sdi->driver->config_set(SR_CONF_CAPTUREFILE, |
| 135 | g_variant_new_string(val), sdi); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 136 | g_ptr_array_add(capturefiles, val); |
| 137 | } else if (!strcmp(keys[j], "samplerate")) { |
Bert Vermeulen | f64c141 | 2011-11-27 19:31:25 +0100 | [diff] [blame] | 138 | sr_parse_sizestring(val, &tmp_u64); |
Bert Vermeulen | 003595a | 2013-03-25 20:21:10 +0100 | [diff] [blame] | 139 | sdi->driver->config_set(SR_CONF_SAMPLERATE, |
| 140 | g_variant_new_uint64(tmp_u64), sdi); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 141 | } else if (!strcmp(keys[j], "unitsize")) { |
| 142 | tmp_u64 = strtoull(val, NULL, 10); |
Bert Vermeulen | 003595a | 2013-03-25 20:21:10 +0100 | [diff] [blame] | 143 | sdi->driver->config_set(SR_CONF_CAPTURE_UNITSIZE, |
| 144 | g_variant_new_uint64(tmp_u64), sdi); |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 145 | } else if (!strcmp(keys[j], "total samples")) { |
| 146 | tmp_u64 = strtoull(val, NULL, 10); |
| 147 | sdi->driver->config_set(SR_CONF_LIMIT_SAMPLES, |
| 148 | g_variant_new_uint64(tmp_u64), sdi); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 149 | } else if (!strcmp(keys[j], "total probes")) { |
| 150 | total_probes = strtoull(val, NULL, 10); |
Bert Vermeulen | 003595a | 2013-03-25 20:21:10 +0100 | [diff] [blame] | 151 | sdi->driver->config_set(SR_CONF_CAPTURE_NUM_PROBES, |
| 152 | g_variant_new_uint64(total_probes), sdi); |
Kristoffer Sjöberg | 464d12c | 2011-12-29 17:04:31 +0100 | [diff] [blame] | 153 | for (p = 0; p < total_probes; p++) { |
| 154 | snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p); |
Bert Vermeulen | fb381e4 | 2012-07-23 14:55:43 +0200 | [diff] [blame] | 155 | if (!(probe = sr_probe_new(p, SR_PROBE_LOGIC, TRUE, |
Bert Vermeulen | 4d68442 | 2012-07-22 12:18:34 +0200 | [diff] [blame] | 156 | probename))) |
| 157 | return SR_ERR; |
| 158 | sdi->probes = g_slist_append(sdi->probes, probe); |
Kristoffer Sjöberg | 464d12c | 2011-12-29 17:04:31 +0100 | [diff] [blame] | 159 | } |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 160 | } else if (!strncmp(keys[j], "probe", 5)) { |
Bert Vermeulen | 4d68442 | 2012-07-22 12:18:34 +0200 | [diff] [blame] | 161 | if (!sdi) |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 162 | continue; |
| 163 | enabled_probes++; |
| 164 | tmp_u64 = strtoul(keys[j]+5, NULL, 10); |
Bert Vermeulen | fb381e4 | 2012-07-23 14:55:43 +0200 | [diff] [blame] | 165 | /* sr_session_save() */ |
| 166 | sr_dev_probe_name_set(sdi, tmp_u64 - 1, val); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 167 | } else if (!strncmp(keys[j], "trigger", 7)) { |
| 168 | probenum = strtoul(keys[j]+7, NULL, 10); |
Bert Vermeulen | 4d68442 | 2012-07-22 12:18:34 +0200 | [diff] [blame] | 169 | sr_dev_trigger_set(sdi, probenum, val); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 170 | } |
| 171 | } |
| 172 | g_strfreev(keys); |
Bert Vermeulen | fb381e4 | 2012-07-23 14:55:43 +0200 | [diff] [blame] | 173 | /* Disable probes not specifically listed. */ |
Bert Vermeulen | 003595a | 2013-03-25 20:21:10 +0100 | [diff] [blame] | 174 | if (total_probes) |
| 175 | for (p = enabled_probes; p < total_probes; p++) |
| 176 | sr_dev_probe_enable(sdi, p, FALSE); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 177 | } |
Bert Vermeulen | 4d68442 | 2012-07-22 12:18:34 +0200 | [diff] [blame] | 178 | devcnt++; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 179 | } |
| 180 | g_strfreev(sections); |
| 181 | g_key_file_free(kf); |
| 182 | |
| 183 | return SR_OK; |
| 184 | } |
| 185 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 186 | /** |
| 187 | * Save the current session to the specified file. |
| 188 | * |
Bert Vermeulen | 18bc270 | 2013-01-08 02:51:03 +0100 | [diff] [blame] | 189 | * @param filename The name of the filename to save the current session as. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 190 | * Must not be NULL. |
Bert Vermeulen | 056be07 | 2012-07-23 15:06:49 +0200 | [diff] [blame] | 191 | * @param sdi The device instance from which the data was captured. |
Bert Vermeulen | 18bc270 | 2013-01-08 02:51:03 +0100 | [diff] [blame] | 192 | * @param buf The data to be saved. |
| 193 | * @param unitsize The number of bytes per sample. |
| 194 | * @param units The number of samples. |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 195 | * |
| 196 | * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR |
| 197 | * upon other errors. |
| 198 | */ |
Bert Vermeulen | 18bc270 | 2013-01-08 02:51:03 +0100 | [diff] [blame] | 199 | SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi, |
| 200 | unsigned char *buf, int unitsize, int units) |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 201 | { |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 202 | GSList *l; |
| 203 | GVariant *gvar; |
| 204 | FILE *meta; |
| 205 | struct sr_probe *probe; |
| 206 | struct zip *zipfile; |
| 207 | struct zip_source *versrc, *metasrc, *logicsrc; |
| 208 | int tmpfile, ret, probecnt; |
| 209 | uint64_t samplerate; |
| 210 | char rawname[16], metafile[32], *s; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 211 | |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 212 | if (!filename) { |
Uwe Hermann | a885ce3 | 2012-11-11 12:44:16 +0100 | [diff] [blame] | 213 | sr_err("%s: filename was NULL", __func__); |
Uwe Hermann | 9f45fb3 | 2012-01-02 14:15:25 +0100 | [diff] [blame] | 214 | return SR_ERR_ARG; |
| 215 | } |
| 216 | |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 217 | /* Quietly delete it first, libzip wants replace ops otherwise. */ |
Bert Vermeulen | 4a1b18f | 2011-02-01 01:41:33 +0100 | [diff] [blame] | 218 | unlink(filename); |
Uwe Hermann | ebc3473 | 2012-03-20 17:51:18 +0100 | [diff] [blame] | 219 | if (!(zipfile = zip_open(filename, ZIP_CREATE, &ret))) |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 220 | return SR_ERR; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 221 | |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 222 | /* init "metadata" */ |
| 223 | strcpy(metafile, "DSLogic-meta-XXXXXX"); |
| 224 | if ((tmpfile = g_mkstemp(metafile)) == -1) |
| 225 | return SR_ERR; |
| 226 | close(tmpfile); |
| 227 | meta = g_fopen(metafile, "wb"); |
| 228 | fprintf(meta, "[version]\n"); |
| 229 | fprintf(meta, "DSLogic version = %s\n", PACKAGE_VERSION); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 230 | |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 231 | /* metadata */ |
| 232 | fprintf(meta, "[header]\n"); |
| 233 | if (sdi->driver) |
| 234 | fprintf(meta, "driver = %s\n", sdi->driver->name); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 235 | |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 236 | /* metadata */ |
| 237 | fprintf(meta, "capturefile = data\n"); |
| 238 | fprintf(meta, "unitsize = %d\n", unitsize); |
| 239 | fprintf(meta, "total samples = %d\n", units); |
| 240 | fprintf(meta, "total probes = %d\n", g_slist_length(sdi->probes)); |
| 241 | if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) { |
| 242 | if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, |
| 243 | &gvar, sdi) == SR_OK) { |
| 244 | samplerate = g_variant_get_uint64(gvar); |
| 245 | s = sr_samplerate_string(samplerate); |
| 246 | fprintf(meta, "samplerate = %s\n", s); |
| 247 | g_free(s); |
| 248 | g_variant_unref(gvar); |
| 249 | } |
| 250 | } |
| 251 | probecnt = 1; |
| 252 | for (l = sdi->probes; l; l = l->next) { |
| 253 | probe = l->data; |
| 254 | if (probe->enabled) { |
| 255 | if (probe->name) |
| 256 | fprintf(meta, "probe%d = %s\n", probecnt, probe->name); |
| 257 | if (probe->trigger) |
| 258 | fprintf(meta, " trigger%d = %s\n", probecnt, probe->trigger); |
| 259 | probecnt++; |
| 260 | } |
| 261 | } |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 262 | |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 263 | if (!(logicsrc = zip_source_buffer(zipfile, buf, |
| 264 | units * unitsize, FALSE))) |
| 265 | return SR_ERR; |
| 266 | snprintf(rawname, 15, "data"); |
| 267 | if (zip_add(zipfile, rawname, logicsrc) == -1) |
| 268 | return SR_ERR; |
| 269 | fclose(meta); |
Bert Vermeulen | 056be07 | 2012-07-23 15:06:49 +0200 | [diff] [blame] | 270 | |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 271 | if (!(metasrc = zip_source_file(zipfile, metafile, 0, -1))) |
| 272 | return SR_ERR; |
| 273 | if (zip_add(zipfile, "header", metasrc) == -1) |
| 274 | return SR_ERR; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 275 | |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 276 | if ((ret = zip_close(zipfile)) == -1) { |
| 277 | sr_info("error saving zipfile: %s", zip_strerror(zipfile)); |
| 278 | return SR_ERR; |
| 279 | } |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 280 | |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 281 | unlink(metafile); |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 282 | |
Bert Vermeulen | f1b296f | 2013-12-16 01:31:46 +0100 | [diff] [blame] | 283 | return SR_OK; |
Bert Vermeulen | 7d65887 | 2011-01-31 22:34:14 +0100 | [diff] [blame] | 284 | } |
Uwe Hermann | 7b870c3 | 2012-10-21 16:13:36 +0200 | [diff] [blame] | 285 | |
| 286 | /** @} */ |