diff options
| author | Phillip Lougher <phillip@squashfs.org.uk> | 2012-12-31 13:27:19 +0000 |
|---|---|---|
| committer | Phillip Lougher <phillip@squashfs.org.uk> | 2012-12-31 13:27:19 +0000 |
| commit | 5207a9b48fedd9f4884b1172e46708bee1b68908 (patch) | |
| tree | 6711d78d874129a14cc0e2c553023d0e73b60aa0 /squashfs-tools | |
| parent | 7a58a3d7c224f28b602e35a21afb9ce5c11af515 (diff) | |
| download | squashfs-tools-5207a9b48fedd9f4884b1172e46708bee1b68908.tar.gz | |
action: Get rid of ERROR statements in child process in file() test
ERROR() since commit 738570df60f65c10cd7fde4134f3af1e005b671a calls
progressbar_error() to synchronise with the progress bar output,
however, this function uses pthread mutexes which are meaningless/
useless in a child process.
Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
Diffstat (limited to 'squashfs-tools')
| -rw-r--r-- | squashfs-tools/action.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c index 25860ca..5e7afbc 100644 --- a/squashfs-tools/action.c +++ b/squashfs-tools/action.c @@ -2089,13 +2089,11 @@ static int file_fn(struct atom *atom, struct action_data *action_data) */ close(STDOUT_FILENO); res = dup(pipefd[1]); - if (res == -1) { - ERROR("file_fn dup failed\n"); + if (res == -1) exit(EXIT_FAILURE); - } + execlp("file", "file", "-b", action_data->pathname, (char *) NULL); - ERROR("file_fn execlp failed\n"); exit(EXIT_FAILURE); } |