===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/newsyslog/newsyslog.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/newsyslog/newsyslog.c	1999/03/08 03:16:34	1.18
--- src/usr.bin/newsyslog/newsyslog.c	1999/06/08 15:42:54	1.19
***************
*** 1,4 ****
! /*	$OpenBSD: newsyslog.c,v 1.18 1999/03/08 03:16:34 millert Exp $	*/
  
  /*
   * Copyright (c) 1997, Jason Downs.  All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: newsyslog.c,v 1.19 1999/06/08 15:42:54 kstailey Exp $	*/
  
  /*
   * Copyright (c) 1997, Jason Downs.  All rights reserved.
***************
*** 61,67 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.18 1999/03/08 03:16:34 millert Exp $";
  #endif /* not lint */
  
  #ifndef CONF
--- 61,67 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.19 1999/06/08 15:42:54 kstailey Exp $";
  #endif /* not lint */
  
  #ifndef CONF
***************
*** 193,204 ****
  		(void)fclose(f);
  	}
          
!         if (verbose) {
!                 if (ent->flags & CE_COMPACT)
!                         printf("%s <%dZ>: ",ent->log,ent->numlogs);
!                 else
!                         printf("%s <%d>: ",ent->log,ent->numlogs);
!         }
          size = sizefile(ent->log);
          modtime = age_old_log(ent->log);
          if (size < 0) {
--- 193,201 ----
  		(void)fclose(f);
  	}
          
! 	if (verbose)
! 		printf("%s <%d%s>: ", ent->log, ent->numlogs,
! 			(ent->flags & CE_COMPACT) ? "Z" : "");
          size = sizefile(ent->log);
          modtime = age_old_log(ent->log);
          if (size < 0) {
***************
*** 216,229 ****
                                          || (modtime < 0)))) {
                          if (verbose)
                                  printf("--> trimming log....\n");
!                         if (noaction && !verbose) {
!                                 if (ent->flags & CE_COMPACT)
!                                         printf("%s <%dZ>: trimming",
!                                                ent->log,ent->numlogs);
!                                 else
!                                         printf("%s <%d>: trimming",
!                                                ent->log,ent->numlogs);
!                         }
                          dotrim(ent->log, ent->numlogs, ent->flags,
                                 ent->permissions, ent->uid, ent->gid, pid);
                  } else {
--- 213,221 ----
                                          || (modtime < 0)))) {
                          if (verbose)
                                  printf("--> trimming log....\n");
! 			if (noaction && !verbose)
! 				printf("%s <%d%s>: ", ent->log, ent->numlogs,
! 					(ent->flags & CE_COMPACT) ? "Z" : "");
                          dotrim(ent->log, ent->numlogs, ent->flags,
                                 ent->permissions, ent->uid, ent->gid, pid);
                  } else {