===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/uniq/uniq.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/uniq/uniq.c	2006/04/07 05:10:02	1.15
--- src/usr.bin/uniq/uniq.c	2007/11/09 20:04:03	1.16
***************
*** 1,4 ****
! /*	$OpenBSD: uniq.c,v 1.15 2006/04/07 05:10:02 ray Exp $	*/
  /*	$NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: uniq.c,v 1.16 2007/11/09 20:04:03 kili Exp $	*/
  /*	$NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: uniq.c,v 1.15 2006/04/07 05:10:02 ray Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: uniq.c,v 1.16 2007/11/09 20:04:03 kili Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
***************
*** 111,121 ****
  	argc -= optind;
  	argv += optind;
  
! 	/* If no flags are set, default is -d -u. */
! 	if (cflag) {
! 		if (dflag || uflag)
! 			usage();
! 	} else if (!dflag && !uflag)
  		dflag = uflag = 1;
  
  	switch(argc) {
--- 111,118 ----
  	argc -= optind;
  	argv += optind;
  
! 	/* If neither -d nor -u are set, default is -d -u. */
! 	if (!dflag && !uflag)
  		dflag = uflag = 1;
  
  	switch(argc) {
***************
*** 175,201 ****
  void
  show(FILE *ofp, char *str)
  {
! 
! 	if (cflag && *str)
! 		(void)fprintf(ofp, "%4d %s", repeats + 1, str);
! 	if ((dflag && repeats) || (uflag && !repeats))
! 		(void)fprintf(ofp, "%s", str);
  }
  
  char *
  skip(char *str)
  {
! 	int infield, nchars, nfields;
  
! 	for (nfields = numfields, infield = 0; nfields && *str; ++str)
! 		if (isspace(*str)) {
! 			if (infield) {
! 				infield = 0;
! 				--nfields;
! 			}
! 		} else if (!infield)
! 			infield = 1;
! 	for (nchars = numchars; nchars-- && *str; ++str)
  		;
  	return (str);
  }
--- 172,197 ----
  void
  show(FILE *ofp, char *str)
  {
! 	if ((dflag && repeats) || (uflag && !repeats)) {
! 		if (cflag)
! 			(void)fprintf(ofp, "%4d %s", repeats + 1, str);
! 		else
! 			(void)fprintf(ofp, "%s", str);
! 	}
  }
  
  char *
  skip(char *str)
  {
! 	int nchars, nfields;
  
! 	for (nfields = numfields; nfields && *str; nfields--) {
! 		while (isblank(*str))
! 			str++;
! 		while (*str && !isblank(*str))
! 			str++;
! 	}
! 	for (nchars = numchars; nchars-- && *str && *str != '\n'; ++str)
  		;
  	return (str);
  }
***************
*** 245,251 ****
  usage(void)
  {
  	extern char *__progname;
! 	
  	(void)fprintf(stderr,
  	    "usage: %s [-c | -d | -u] [-f fields] [-s chars] [input_file [output_file]]\n",
  	    __progname);
--- 241,247 ----
  usage(void)
  {
  	extern char *__progname;
! 
  	(void)fprintf(stderr,
  	    "usage: %s [-c | -d | -u] [-f fields] [-s chars] [input_file [output_file]]\n",
  	    __progname);