Don't print exit messages when used as a login shell, requested by martynas@ a

while back.
This commit is contained in:
Nicholas Marriott 2009-10-13 13:11:06 +00:00
parent 5d78371628
commit 760e39e405

View File

@ -212,30 +212,36 @@ client_main(struct client_ctx *cctx)
} }
out: out:
if (sigterm) { /*
printf("[terminated]\n"); * Print exit status message, unless running as a login shell where it
return (1); * would either be pointless or irritating.
} */
switch (cctx->exittype) { if (!login_shell) {
case CCTX_DIED: if (sigterm) {
printf("[lost server]\n"); printf("[terminated]\n");
return (0); return (1);
case CCTX_SHUTDOWN: }
printf("[server exited]\n"); switch (cctx->exittype) {
return (0); case CCTX_DIED:
case CCTX_EXIT: printf("[lost server]\n");
if (cctx->errstr != NULL) { return (0);
printf("[error: %s]\n", cctx->errstr); case CCTX_SHUTDOWN:
printf("[server exited]\n");
return (0);
case CCTX_EXIT:
if (cctx->errstr != NULL) {
printf("[error: %s]\n", cctx->errstr);
return (1);
}
printf("[exited]\n");
return (0);
case CCTX_DETACH:
printf("[detached]\n");
return (0);
default:
printf("[unknown error]\n");
return (1); return (1);
} }
printf("[exited]\n");
return (0);
case CCTX_DETACH:
printf("[detached]\n");
return (0);
default:
printf("[unknown error]\n");
return (1);
} }
} }