aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoni <matzeton@googlemail.com>2016-07-03 17:21:02 +0200
committertoni <matzeton@googlemail.com>2016-07-03 17:21:02 +0200
commit7248ec097b19828e047e83df89aa7bac4150c2cd (patch)
tree4c79cfc37113275bc8a36ff5d011078b1a4f3422
parent30e4c4858ce9d4be90af3a501704db0d4e93da5e (diff)
parentcddc6abfc965e39577009a398eed55523701e9bc (diff)
Merge branch 'wheezy' into jessie
-rw-r--r--main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.c b/main.c
index 670503e..416b20f 100644
--- a/main.c
+++ b/main.c
@@ -83,7 +83,7 @@ run_cryptcreate(char *pass, char *crypt_cmd)
int
main(int argc, char **argv)
{
- int ffd, c_status, opt;
+ int ffd, opt;
pid_t child;
char pbuf[MAX_PASSWD_LEN+1];
char *fifo_path = NULL;
@@ -139,7 +139,7 @@ main(int argc, char **argv)
}
}
stop_ui();
- wait(&c_status);
+ wait(&child);
if (read(ffd, pbuf, MAX_PASSWD_LEN) > 0) {
if (run_cryptcreate(pbuf, crypt_cmd) != 0) {
fprintf(stderr, "cryptcreate error\n");