From: Matthew Dillon Date: Wed, 22 Oct 2003 00:51:15 +0000 (+0000) Subject: Use sys_nsig instead of NSIG so libc-suspplied arrays match up. X-Git-Tag: v2.0.1~12786 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/9f8c51486a070c0acf3fee78dd7ae01c7574b423 Use sys_nsig instead of NSIG so libc-suspplied arrays match up. --- diff --git a/bin/kill/kill.c b/bin/kill/kill.c index 3538ea58cd..2c50b718e9 100644 --- a/bin/kill/kill.c +++ b/bin/kill/kill.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1988, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)kill.c 8.4 (Berkeley) 4/28/95 * $FreeBSD: src/bin/kill/kill.c,v 1.11.2.2 2002/07/28 10:19:57 tjr Exp $ - * $DragonFly: src/bin/kill/kill.c,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/kill/kill.c,v 1.3 2003/10/22 00:51:15 dillon Exp $ */ #include @@ -73,7 +73,7 @@ main(int argc, char *argv[]) errx(1, "illegal signal number: %s", *argv); if (numsig >= 128) numsig -= 128; - if (numsig <= 0 || numsig >= NSIG) + if (numsig <= 0 || numsig >= sys_nsig) nosig(*argv); printf("%s\n", sys_signame[numsig]); exit(0); @@ -103,7 +103,7 @@ main(int argc, char *argv[]) numsig = strtol(*argv, &ep, 10); if (!**argv || *ep) errx(1, "illegal signal number: %s", *argv); - if (numsig < 0 || numsig >= NSIG) + if (numsig < 0 || numsig >= sys_nsig) nosig(*argv); } else nosig(*argv); @@ -137,7 +137,7 @@ signame_to_signum(char *sig) if (!strncasecmp(sig, "sig", (size_t)3)) sig += 3; - for (n = 1; n < NSIG; n++) { + for (n = 1; n < sys_nsig; n++) { if (!strcasecmp(sys_signame[n], sig)) return (n); } @@ -158,9 +158,9 @@ printsignals(FILE *fp) { int n; - for (n = 1; n < NSIG; n++) { + for (n = 1; n < sys_nsig; n++) { (void)fprintf(fp, "%s", sys_signame[n]); - if (n == (NSIG / 2) || n == (NSIG - 1)) + if (n == (sys_nsig / 2) || n == (sys_nsig - 1)) (void)fprintf(fp, "\n"); else (void)fprintf(fp, " ");