summaryrefslogtreecommitdiffstats
path: root/client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-09-02 20:01:22 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-09-02 20:01:22 +0000
commitc23bde74ec034f864410c9b71c3ef72d122df719 (patch)
treeb82387916d645b6039c9b6842543e43b83716735 /client.c
parentecffcf16677bec14465e5ab04198cf67bfdad4b5 (diff)
Set exittype for error exit as well as the error string.
Diffstat (limited to 'client.c')
-rw-r--r--client.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/client.c b/client.c
index f738873d..32bf6b9c 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.66 2009-08-19 09:00:05 nicm Exp $ */
+/* $OpenBSD: client.c,v 1.15 2009/09/02 20:00:10 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -205,7 +205,7 @@ client_main(struct client_ctx *cctx)
}
}
}
-
+
if (sigterm) {
printf("[terminated]\n");
return (1);
@@ -223,9 +223,12 @@ client_main(struct client_ctx *cctx)
case CCTX_DETACH:
printf("[detached]\n");
return (0);
- default:
+ case CCTX_ERROR:
printf("[error: %s]\n", cctx->errstr);
return (1);
+ default:
+ printf("[error: unknown error]\n");
+ return (1);
}
}
@@ -279,6 +282,7 @@ client_msg_dispatch(struct client_ctx *cctx)
printdata.msg[(sizeof printdata.msg) - 1] = '\0';
cctx->errstr = xstrdup(printdata.msg);
+ cctx->exittype = CCTX_ERROR;
imsg_free(&imsg);
return (-1);
case MSG_EXIT: