===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sendbug/sendbug.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -c -r1.46 -r1.47
*** src/usr.bin/sendbug/sendbug.c	2007/05/07 02:11:12	1.46
--- src/usr.bin/sendbug/sendbug.c	2007/05/09 02:36:56	1.47
***************
*** 1,4 ****
! /*	$OpenBSD: sendbug.c,v 1.46 2007/05/07 02:11:12 ray Exp $	*/
  
  /*
   * Written by Ray Lai <ray@cyth.net>.
--- 1,4 ----
! /*	$OpenBSD: sendbug.c,v 1.47 2007/05/09 02:36:56 ray Exp $	*/
  
  /*
   * Written by Ray Lai <ray@cyth.net>.
***************
*** 46,52 ****
  struct passwd *pw;
  char os[BUFSIZ], rel[BUFSIZ], mach[BUFSIZ], details[BUFSIZ];
  char *fullname, *tmppath;
! int wantcleanup;
  
  __dead void
  usage(void)
--- 46,52 ----
  struct passwd *pw;
  char os[BUFSIZ], rel[BUFSIZ], mach[BUFSIZ], details[BUFSIZ];
  char *fullname, *tmppath;
! int Dflag, wantcleanup;
  
  __dead void
  usage(void)
***************
*** 68,74 ****
  int
  main(int argc, char *argv[])
  {
! 	int ch, c, Dflag = 0, fd, ret = 1;
  	const char *tmpdir;
  	struct stat sb;
  	char *pr_form;
--- 68,74 ----
  int
  main(int argc, char *argv[])
  {
! 	int ch, c, fd, ret = 1;
  	const char *tmpdir;
  	struct stat sb;
  	char *pr_form;
***************
*** 135,145 ****
  			}
  			fclose(frfp);
  		}
! 	} else {
  		template(fp);
- 		if (!Dflag)
- 			dmesg(fp);
- 	}
  
  	if (fflush(fp) == EOF || fstat(fd, &sb) == -1 || fclose(fp) == EOF)
  		err(1, "error creating template");
--- 135,142 ----
  			}
  			fclose(frfp);
  		}
! 	} else
  		template(fp);
  
  	if (fflush(fp) == EOF || fstat(fd, &sb) == -1 || fclose(fp) == EOF)
  		err(1, "error creating template");
***************
*** 576,579 ****
--- 573,579 ----
  	fprintf(fp, ">Fix:\n");
  	fprintf(fp, "\t<how to correct or work around the problem,"
  	    " if known (multiple lines)>\n");
+ 
+ 	if (!Dflag)
+ 		dmesg(fp);
  }