diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-01-16 13:44:18 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-01-16 13:44:18 +0000 |
| commit | 757168e2c8af374436108266cc3cfd32a946a590 (patch) | |
| tree | 293929274f50de8733f00c4ae561a85e9c5fc16f /Src/watch.c | |
| parent | 052316fea3b74599de04fb3990a444b0ba08b04b (diff) | |
| download | zsh-757168e2c8af374436108266cc3cfd32a946a590.tar.gz zsh-757168e2c8af374436108266cc3cfd32a946a590.tar.xz zsh-757168e2c8af374436108266cc3cfd32a946a590.zip | |
remove 13108 (trap queues); replace with signal queueing to ensure that user signal handlers are only executed when it is safe to run them (13365)
Diffstat (limited to 'Src/watch.c')
| -rw-r--r-- | Src/watch.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Src/watch.c b/Src/watch.c index 2532e0a63..4f63a5bd9 100644 --- a/Src/watch.c +++ b/Src/watch.c @@ -235,7 +235,7 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini) # endif /* WATCH_UTMP_UT_HOST */ while (*fmt) - if (*fmt == '\\') + if (*fmt == '\\') { if (*++fmt) { if (prnt) putchar(*fmt); @@ -244,6 +244,7 @@ watchlog2(int inout, WATCH_STRUCT_UTMP *u, char *fmt, int prnt, int fini) return fmt; else break; + } else if (*fmt == fini) return ++fmt; else if (*fmt != '%') { @@ -490,8 +491,6 @@ dowatch(void) int uct, wct; s = watch; - if (!(fmt = getsparam("WATCHFMT"))) - fmt = DEFAULT_WATCHFMT; holdintr(); if (!wtab) { @@ -541,6 +540,9 @@ dowatch(void) free(utab); return; } + queue_signals(); + if (!(fmt = getsparam("WATCHFMT"))) + fmt = DEFAULT_WATCHFMT; while ((uct || wct) && !errflag) if (!uct || (wct && ucmp(uptr, wptr) > 0)) wct--, watchlog(0, wptr++, s, fmt); @@ -548,6 +550,7 @@ dowatch(void) uct--, watchlog(1, uptr++, s, fmt); else uptr++, wptr++, wct--, uct--; + unqueue_signals(); free(wtab); wtab = utab; wtabsz = utabsz; |