===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/uniq/uniq.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/usr.bin/uniq/uniq.c	2021/11/17 23:09:38	1.29
--- src/usr.bin/uniq/uniq.c	2021/12/24 17:59:28	1.30
***************
*** 1,4 ****
! /*	$OpenBSD: uniq.c,v 1.29 2021/11/17 23:09:38 cheloha Exp $	*/
  /*	$NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: uniq.c,v 1.30 2021/12/24 17:59:28 cheloha Exp $	*/
  /*	$NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $	*/
  
  /*
***************
*** 57,63 ****
  int
  main(int argc, char *argv[])
  {
! 	char *prevline, *t1, *t2, *thisline;
  	FILE *ifp = NULL, *ofp = NULL;
  	size_t prevsize, thissize, tmpsize;
  	ssize_t len;
--- 57,63 ----
  int
  main(int argc, char *argv[])
  {
! 	char *p, *prevline, *t, *thisline, *tmp;
  	FILE *ifp = NULL, *ofp = NULL;
  	size_t prevsize, thissize, tmpsize;
  	ssize_t len;
***************
*** 142,147 ****
--- 142,151 ----
  	}
  	if (prevline[len - 1] == '\n')
  		prevline[len - 1] = '\0';
+ 	if (numfields || numchars)
+ 		p = skip(prevline);
+ 	else
+ 		p = prevline;
  	
  	thissize = 0;
  	thisline = NULL;
***************
*** 150,169 ****
  			thisline[len - 1] = '\0';
  
  		/* If requested get the chosen fields + character offsets. */
! 		if (numfields || numchars) {
! 			t1 = skip(thisline);
! 			t2 = skip(prevline);
! 		} else {
! 			t1 = thisline;
! 			t2 = prevline;
! 		}
  
  		/* If different, print; set previous to new value. */
! 		if ((iflag ? strcasecmp : strcmp)(t1, t2)) {
  			show(ofp, prevline);
! 			t1 = prevline;
  			prevline = thisline;
! 			thisline = t1;
  			tmpsize = prevsize;
  			prevsize = thissize;
  			thissize = tmpsize;
--- 154,173 ----
  			thisline[len - 1] = '\0';
  
  		/* If requested get the chosen fields + character offsets. */
! 		if (numfields || numchars)
! 			t = skip(thisline);
! 		else
! 			t = thisline;
  
  		/* If different, print; set previous to new value. */
! 		if ((iflag ? strcasecmp : strcmp)(p, t)) {
  			show(ofp, prevline);
! 			tmp = prevline;
  			prevline = thisline;
! 			thisline = tmp;
! 			tmp = p;
! 			p = t;
! 			t = tmp;
  			tmpsize = prevsize;
  			prevsize = thissize;
  			thissize = tmpsize;