From b80b1d61ed3b09405a34807472c7e503a67da3af Mon Sep 17 00:00:00 2001 From: Vitaliy Ivanov Date: Mon, 25 Jul 2011 17:12:50 -0700 Subject: [PATCH] --- yaml --- r: 258986 b: refs/heads/master c: 2fdf2130926f07881c75e3905ece472c37d7703f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/os-Linux/helper.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cd618865b47b..ff41f40113cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a99ae7c57d2de5cad9562bed32addf064521116 +refs/heads/master: 2fdf2130926f07881c75e3905ece472c37d7703f diff --git a/trunk/arch/um/os-Linux/helper.c b/trunk/arch/um/os-Linux/helper.c index b6b1096152aa..feff22d64672 100644 --- a/trunk/arch/um/os-Linux/helper.c +++ b/trunk/arch/um/os-Linux/helper.c @@ -28,14 +28,14 @@ static int helper_child(void *arg) { struct helper_data *data = arg; char **argv = data->argv; - int err; + int err, ret; if (data->pre_exec != NULL) (*data->pre_exec)(data->pre_data); err = execvp_noalloc(data->buf, argv[0], argv); /* If the exec succeeds, we don't get here */ - write(data->fd, &err, sizeof(err)); + CATCH_EINTR(ret = write(data->fd, &err, sizeof(err))); return 0; }