diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-10-27 11:35:07 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-10-28 08:53:09 +0100 |
| commit | 2b29b7186459d945ec448694164bfe4239b30d72 (patch) | |
| tree | 561495b1870facf03f7892559a184f4f49df1fe2 /source4/heimdal/lib/roken/rkpty.c | |
| parent | 698b7fd43658d9e96d28f26c9e1dae5e770bb57f (diff) | |
| download | samba-2b29b7186459d945ec448694164bfe4239b30d72.tar.gz samba-2b29b7186459d945ec448694164bfe4239b30d72.tar.bz2 samba-2b29b7186459d945ec448694164bfe4239b30d72.zip | |
s4: import lorikeet-heimdal-200810271034
metze
Diffstat (limited to 'source4/heimdal/lib/roken/rkpty.c')
| -rw-r--r-- | source4/heimdal/lib/roken/rkpty.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/heimdal/lib/roken/rkpty.c b/source4/heimdal/lib/roken/rkpty.c index e29b2c5aca..309469722b 100644 --- a/source4/heimdal/lib/roken/rkpty.c +++ b/source4/heimdal/lib/roken/rkpty.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008 Kungliga Tekniska Högskolan + * Copyright (c) 2008 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -183,10 +183,10 @@ eval_parent(pid_t pid) } alarm(0); if (alarmset == SIGALRM) - errx(1, "timeout waiting for %s (line %u)", + errx(1, "timeout waiting for %s (line %u)", c->str, c->lineno); else if (alarmset) - errx(1, "got a signal %d waiting for %s (line %u)", + errx(1, "got a signal %d waiting for %s (line %u)", alarmset, c->str, c->lineno); if (sret <= 0) errx(1, "end command while waiting for %s (line %u)", @@ -211,7 +211,7 @@ eval_parent(pid_t pid) case 'r': ctrl = '\r'; break; case 't': ctrl = '\t'; break; default: - errx(1, "unknown control char %c (line %u)", + errx(1, "unknown control char %c (line %u)", c->str[i], c->lineno); } if (net_write(master, &ctrl, 1) != 1) @@ -327,7 +327,7 @@ main(int argc, char **argv) sa.sa_handler = caught_signal; sa.sa_flags = 0; sigemptyset (&sa.sa_mask); - + sigaction(SIGALRM, &sa, NULL); } |