diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2007-05-09 02:36:57 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2007-05-09 02:36:57 +0000 |
| commit | a78f0f391269b4e08ad92bef6673cf39a1d58574 (patch) | |
| tree | 8a029c56038b5f949b1f63d006054a1f1938402e /usr.bin | |
| parent | 8246850305156ca641778bdab9b507f513ca1546 (diff) | |
Be more consistent about when dmesg is attached to template.
Specifically, -V.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/sendbug/sendbug.c | 14 |
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); } |