emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/package_msg: don't roundtrip data with fmemopen

Browse Source 
Using fmemopen here wasn't necessary, since memcpy could have been used
with way lower overhead. We don't use a dedicated function, because
turning a data field into a string is an inefficient operation and
shouldn't be encouraged.

Also don't initialize data when it's declared, it isn't necessary.
This commit is contained in:
Érico Nogueira 2021-05-12 10:19:55 -03:00 committed by Duncan Overbruck
parent 4a5eb8dc87
commit 08ad0c2a9b
No known key found for this signature in database
GPG Key ID: 335C1D17EC3D6E35
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/package_msg.c
View File

@ -34,8 +34,7 @@ int HIDDEN
xbps_cb_message(struct xbps_handle *xhp, xbps_dictionary_t pkgd, const char *key) xbps_cb_message(struct xbps_handle *xhp, xbps_dictionary_t pkgd, const char *key)
{ {
xbps_data_t msg; xbps_data_t msg;
FILE *f = NULL; const void *data;
const void *data = NULL;
const char *pkgver = NULL; const char *pkgver = NULL;
size_t len; size_t len;
char *buf = NULL; char *buf = NULL;
@ -52,35 +51,22 @@ xbps_cb_message(struct xbps_handle *xhp, xbps_dictionary_t pkgd, const char *key
if (xbps_object_type(msg) != XBPS_TYPE_DATA) if (xbps_object_type(msg) != XBPS_TYPE_DATA)
goto out; goto out;
/* turn data from msg into a string */
data = xbps_data_data_nocopy(msg); data = xbps_data_data_nocopy(msg);
len = xbps_data_size(msg); len = xbps_data_size(msg);
if ((f = fmemopen(__UNCONST(data), len, "r")) == NULL) {
rv = errno;
xbps_dbg_printf(xhp, "[%s] %s: fmemopen %s\n", __func__, pkgver, strerror(rv));
goto out;
};
buf = malloc(len+1); buf = malloc(len+1);
assert(buf); assert(buf);
if (fread(buf, len, 1, f) != len) { memcpy(buf, data, len);
if (ferror(f)) { /* terminate string */
rv = errno;
xbps_dbg_printf(xhp, "[%s] %s: fread %s\n", __func__, pkgver, strerror(rv));
goto out;
}
}
/* terminate buffer and notify client to show the post-install message */
buf[len] = '\0'; buf[len] = '\0';
/* notify client to show the post-install message */
if (strcmp(key, "install-msg") == 0) if (strcmp(key, "install-msg") == 0)
xbps_set_cb_state(xhp, XBPS_STATE_SHOW_INSTALL_MSG, 0, pkgver, "%s", buf); xbps_set_cb_state(xhp, XBPS_STATE_SHOW_INSTALL_MSG, 0, pkgver, "%s", buf);
else else
xbps_set_cb_state(xhp, XBPS_STATE_SHOW_REMOVE_MSG, 0, pkgver, "%s", buf); xbps_set_cb_state(xhp, XBPS_STATE_SHOW_REMOVE_MSG, 0, pkgver, "%s", buf);
out: out:
if (f != NULL) free(buf);
fclose(f);
if (buf != NULL)
free(buf);
return rv; return rv;
} }