Sync OpenBSD patchset 405:

Don't print exit messages when used as a login shell, requested by martynas@ a
while back.
This commit is contained in:
Tiago Cunha 2009-10-15 01:45:13 +00:00
parent b8e4bd2029
commit 9800dc4697

View File

@ -1,4 +1,4 @@
/* $Id: client.c,v 1.75 2009-09-23 15:18:56 tcunha Exp $ */ /* $Id: client.c,v 1.76 2009-10-15 01:45:13 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -216,6 +216,11 @@ client_main(struct client_ctx *cctx)
} }
out: out:
/*
* Print exit status message, unless running as a login shell where it
* would either be pointless or irritating.
*/
if (!login_shell) {
if (sigterm) { if (sigterm) {
printf("[terminated]\n"); printf("[terminated]\n");
return (1); return (1);
@ -242,6 +247,7 @@ out:
return (1); return (1);
} }
} }
}
int int
client_msg_dispatch(struct client_ctx *cctx) client_msg_dispatch(struct client_ctx *cctx)