nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

inject_randr1.5: Refactor reading and storing reply buffer to a struct 

Allows easier introduction of additional reply buffers in upcoming
changes.
This commit is contained in:
Vladimir Panteleev 2017-09-12 06:58:29 +00:00 committed by Michael Stapelberg
parent 16e0d5ec06
commit 38447ab78c
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
testcases/inject_randr1.5.c
View File

@ -41,9 +41,13 @@ void cleanup_socket(void) {
} }
} }
struct injected_reply {
void *buf;
off_t len;
};
/* BEGIN RandR 1.5 specific */ /* BEGIN RandR 1.5 specific */
static void *injected_reply = NULL; static struct injected_reply getmonitors_reply = {NULL, 0};
static off_t injected_reply_len = 0;
/* END RandR 1.5 specific */ /* END RandR 1.5 specific */
#define XCB_PAD(i) (-(i)&3) #define XCB_PAD(i) (-(i)&3)
@ -294,10 +298,10 @@ static void read_server_x11_packet_cb(EV_P_ ev_io *w, int revents) {
if (sequence == connstate->getmonitors) { if (sequence == connstate->getmonitors) {
printf("RRGetMonitors reply!\n"); printf("RRGetMonitors reply!\n");
if (injected_reply != NULL) { if (getmonitors_reply.buf != NULL) {
printf("injecting reply\n"); printf("injecting reply\n");
((generic_x11_reply_t *)injected_reply)->sequence = sequence; ((generic_x11_reply_t *)getmonitors_reply.buf)->sequence = sequence;
must_write(writeall(connstate->clientw->fd, injected_reply, injected_reply_len)); must_write(writeall(connstate->clientw->fd, getmonitors_reply.buf, getmonitors_reply.len));
free(packet); free(packet);
return; return;
} }
@ -322,7 +326,7 @@ static void child_cb(EV_P_ ev_child *w, int revents) {
} }
} }
static void must_read_reply(const char *filename) { static void must_read_reply(const char *filename, struct injected_reply *reply) {
FILE *f; FILE *f;
if ((f = fopen(filename, "r")) == NULL) { if ((f = fopen(filename, "r")) == NULL) {
err(EXIT_FAILURE, "fopen(%s)", filename); err(EXIT_FAILURE, "fopen(%s)", filename);
@ -331,11 +335,9 @@ static void must_read_reply(const char *filename) {
if (fstat(fileno(f), &stbuf) != 0) { if (fstat(fileno(f), &stbuf) != 0) {
err(EXIT_FAILURE, "fstat(%s)", filename); err(EXIT_FAILURE, "fstat(%s)", filename);
} }
/* BEGIN RandR 1.5 specific */ reply->len = stbuf.st_size;
injected_reply_len = stbuf.st_size; reply->buf = smalloc(stbuf.st_size);
injected_reply = smalloc(stbuf.st_size); int n = fread(reply->buf, 1, stbuf.st_size, f);
int n = fread(injected_reply, 1, stbuf.st_size, f);
/* END RandR 1.5 specific */
if (n != stbuf.st_size) { if (n != stbuf.st_size) {
err(EXIT_FAILURE, "fread(%s)", filename); err(EXIT_FAILURE, "fread(%s)", filename);
} }
@ -355,7 +357,7 @@ int main(int argc, char *argv[]) {
switch (opt) { switch (opt) {
case 0: case 0:
if (strcmp(long_options[option_index].name, "getmonitors_reply") == 0) { if (strcmp(long_options[option_index].name, "getmonitors_reply") == 0) {
must_read_reply(optarg); must_read_reply(optarg, &getmonitors_reply);
} }
break; break;
default: default: