diff options
| author | Phillip Lougher <phillip@squashfs.org.uk> | 2012-12-31 13:40:56 +0000 |
|---|---|---|
| committer | Phillip Lougher <phillip@squashfs.org.uk> | 2012-12-31 13:40:56 +0000 |
| commit | b0ffda8e80a296c14d9b32c6162ce6e25bc6acfb (patch) | |
| tree | 8a743a46e7c00b8c9dac588cc40ed08acf2c28a5 /squashfs-tools | |
| parent | 5207a9b48fedd9f4884b1172e46708bee1b68908 (diff) | |
| download | squashfs-tools-b0ffda8e80a296c14d9b32c6162ce6e25bc6acfb.tar.gz | |
pseudo: Get rid of ERROR statements in child process in exec_file()
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/mksquashfs.c | 2 | ||||
| -rw-r--r-- | squashfs-tools/pseudo.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c index 5df4b05..b2276cf 100644 --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c @@ -5016,7 +5016,7 @@ int parse_num(char *arg, int *res) #define VERSION() \ - printf("mksquashfs version 4.2-git (2012/12/30)\n");\ + printf("mksquashfs version 4.2-git (2012/12/31)\n");\ printf("copyright (C) 2012 Phillip Lougher "\ "<phillip@squashfs.org.uk>\n\n"); \ printf("This program is free software; you can redistribute it and/or"\ diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c index c90b8da..f235af8 100644 --- a/squashfs-tools/pseudo.c +++ b/squashfs-tools/pseudo.c @@ -270,12 +270,10 @@ int exec_file(char *command, struct pseudo_dev *dev) if(child == 0) { close(STDOUT_FILENO); res = dup(pipefd[1]); - if(res == -1) { - ERROR("Executing dynamic pseudo file, dup failed\n"); + if(res == -1) exit(EXIT_FAILURE); - } + execl("/bin/sh", "sh", "-c", command, (char *) NULL); - ERROR("Executing dynamic pseudo file, execl failed\n"); exit(EXIT_FAILURE); } |