diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-03-23 15:46:41 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-03-23 15:46:41 +0000 |
| commit | 39e29b364f8f5d3d1176e2428e832eb3e3c10a63 (patch) | |
| tree | a3df3406f68980eb5af7e6066dfad8b8e4131523 /usr.bin/sendbug/sendbug.c | |
| parent | 2c3d80e377180611b0f1d88599368e826a2361b3 (diff) | |
Since we now have our own program, we can export more things that
matter. Include kern.version, which tells a hell of a lot. ok millert ray
Diffstat (limited to 'usr.bin/sendbug/sendbug.c')
| -rw-r--r-- | usr.bin/sendbug/sendbug.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/usr.bin/sendbug/sendbug.c b/usr.bin/sendbug/sendbug.c index 0de8852aa82..a5a5550316c 100644 --- a/usr.bin/sendbug/sendbug.c +++ b/usr.bin/sendbug/sendbug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sendbug.c,v 1.13 2007/03/23 06:16:24 ray Exp $ */ +/* $OpenBSD: sendbug.c,v 1.14 2007/03/23 15:46:40 deraadt Exp $ */ /* * Written by Ray Lai <ray@cyth.net>. @@ -37,7 +37,7 @@ const char *categories = "system user library documentation ports kernel " char *version = "4.2"; struct passwd *pw; -char os[BUFSIZ], rel[BUFSIZ], mach[BUFSIZ]; +char os[BUFSIZ], rel[BUFSIZ], mach[BUFSIZ], details[BUFSIZ]; char *fullname; char *tmppath; int wantcleanup; @@ -246,7 +246,7 @@ init(void) size_t len = 0, namelen; int sysname[2]; const char *src; - char *dst; + char *dst, *cp; if ((pw = getpwuid(getuid())) == NULL) { err(1, "getpwuid"); @@ -298,6 +298,24 @@ init(void) err(1, "sysctl"); } + sysname[0] = CTL_KERN; + sysname[1] = KERN_VERSION; + len = sizeof(details) - 1; + if (sysctl(sysname, 2, &details, &len, NULL, 0) == -1) { + err(1, "sysctl"); + } + + cp = strchr(details, '\n'); + if (cp) { + cp++; + if (*cp) + *cp++ = '\t'; + if (*cp) + *cp++ = '\t'; + if (*cp) + *cp++ = '\t'; + } + sysname[0] = CTL_HW; sysname[1] = HW_MACHINE; len = sizeof(mach) - 1; @@ -326,7 +344,7 @@ send_file(const char *file, int dst) blank = 1; /* Skip comments, but only if we encountered a blank line. */ while (len) { - char *sp, *ep = NULL; + char *sp = NULL, *ep = NULL; size_t copylen; if (blank && (sp = memchr(buf, '<', len)) != NULL) @@ -387,6 +405,7 @@ template(FILE *fp) fprintf(fp, ">Environment:\n"); fprintf(fp, "\t<machine, os, target, libraries (multiple lines)>\n"); fprintf(fp, "\tSystem : %s %s\n", os, rel); + fprintf(fp, "\tDetails : %s\n", details); fprintf(fp, "\tArchitecture: %s.%s\n", os, mach); fprintf(fp, "\tMachine : %s\n", mach); fprintf(fp, ">Description:\n"); |