45c45
< "$Id: sysctl.c,v 1.18 1998/08/25 07:38:19 dfr Exp $";
---
> "$Id: sysctl.c,v 1.19 1998/11/08 19:27:43 phk Exp $";
61c61
< static int Aflag, aflag, nflag, wflag, Xflag, bflag;
---
> static int Aflag, aflag, bflag, dflag, nflag, wflag, Xflag;
73,77c73,78
< (void)fprintf(stderr, "%s\n%s\n%s\n%s\n",
< "usage: sysctl [-bnX] variable ...",
< " sysctl [-bnX] -w variable=value ...",
< " sysctl [-bnX] -a",
< " sysctl [-bnX] -A");
---
> (void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n",
> "usage: sysctl [-bdn] variable ...",
> " sysctl [-bn] -w variable=value ...",
> " sysctl [-bdn] -a",
> " sysctl [-bdn] -A",
> " sysctl [-bdn] -X");
88c89
< while ((ch = getopt(argc, argv, "AabnwX")) != -1) {
---
> while ((ch = getopt(argc, argv, "AabdnwX")) != -1) {
92a94
> case 'd': dflag = 1; break;
101a104,105
> if (wflag && (Aflag || aflag || dflag))
> usage();
339c343
< char name[BUFSIZ], *fmt;
---
> char name[BUFSIZ], descr[BUFSIZ], *fmt;
345a350,370
> qoid[0] = 0;
> memcpy(qoid + 2, oid, nlen * sizeof(int));
>
> qoid[1] = 1;
> j = sizeof name;
> i = sysctl(qoid, nlen + 2, name, &j, 0, 0);
> if (i || !j)
> err(1, "sysctl name %d %d %d", i, j, errno);
>
> if (dflag) {
> qoid[1] = 5;
> j = sizeof descr;
> i = sysctl(qoid, nlen + 2, descr, &j, 0, 0);
> if (i || !j)
> err(1, "sysctl name %d %d %d", i, j, errno);
> if (!nflag)
> printf("%s: ", name);
> printf("%s", descr[0] ? descr : "[no description]");
> return (0);
> }
>
362d386
< qoid[0] = 0;
364,365d387
< memcpy(qoid + 2, oid, nlen * sizeof(int));
<
375,380d396
< qoid[1] = 1;
< j = sizeof name;
< i = sysctl(qoid, nlen + 2, name, &j, 0, 0);
< if (i || !j)
< err(1, "sysctl name %d %d %d", i, j, errno);
<