summaryrefslogtreecommitdiff
path: root/usr.bin/sendbug/sendbug.c
diff options
context:
space:
mode:
authorRay Lai <ray@cvs.openbsd.org>2007-05-09 02:36:57 +0000
committerRay Lai <ray@cvs.openbsd.org>2007-05-09 02:36:57 +0000
commita78f0f391269b4e08ad92bef6673cf39a1d58574 (patch)
tree8a029c56038b5f949b1f63d006054a1f1938402e /usr.bin/sendbug/sendbug.c
parent8246850305156ca641778bdab9b507f513ca1546 (diff)
Be more consistent about when dmesg is attached to template.
Specifically, -V.
Diffstat (limited to 'usr.bin/sendbug/sendbug.c')
-rw-r--r--usr.bin/sendbug/sendbug.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/sendbug/sendbug.c b/usr.bin/sendbug/sendbug.c
index 3ba65705512..6bf0f1c50aa 100644
--- a/usr.bin/sendbug/sendbug.c
+++ b/usr.bin/sendbug/sendbug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sendbug.c,v 1.46 2007/05/07 02:11:12 ray Exp $ */
+/* $OpenBSD: sendbug.c,v 1.47 2007/05/09 02:36:56 ray Exp $ */
/*
* Written by Ray Lai <ray@cyth.net>.
@@ -46,7 +46,7 @@ char *version = "4.2";
struct passwd *pw;
char os[BUFSIZ], rel[BUFSIZ], mach[BUFSIZ], details[BUFSIZ];
char *fullname, *tmppath;
-int wantcleanup;
+int Dflag, wantcleanup;
__dead void
usage(void)
@@ -68,7 +68,7 @@ cleanup()
int
main(int argc, char *argv[])
{
- int ch, c, Dflag = 0, fd, ret = 1;
+ int ch, c, fd, ret = 1;
const char *tmpdir;
struct stat sb;
char *pr_form;
@@ -135,11 +135,8 @@ main(int argc, char *argv[])
}
fclose(frfp);
}
- } else {
+ } else
template(fp);
- if (!Dflag)
- dmesg(fp);
- }
if (fflush(fp) == EOF || fstat(fd, &sb) == -1 || fclose(fp) == EOF)
err(1, "error creating template");
@@ -576,4 +573,7 @@ template(FILE *fp)
fprintf(fp, ">Fix:\n");
fprintf(fp, "\t<how to correct or work around the problem,"
" if known (multiple lines)>\n");
+
+ if (!Dflag)
+ dmesg(fp);
}