 @@ -1,14 +1,14 @@
-/*	$NetBSD: uniq.c,v 1.18 2012/08/26 14:14:16 wiz Exp $	*/
+/*	$NetBSD: uniq.c,v 1.19 2016/10/14 19:43:59 abhinav Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Case Larsen.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -32,54 +32,55 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
 #endif
-__RCSID("$NetBSD: uniq.c,v 1.18 2012/08/26 14:14:16 wiz Exp $");
+__RCSID("$NetBSD: uniq.c,v 1.19 2016/10/14 19:43:59 abhinav Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 static int cflag, dflag, uflag;
 static int numchars, numfields, repeats;
 static FILE *file(const char *, const char *);
 static void show(FILE *, const char *);
-static const char *skip(const char *);
+static const char *skip(const char *, size_t *);
 static void obsolete(char *[]);
 static void usage(void) __dead;
 int
 main (int argc, char *argv[])
+{
 	const char *t1, *t2;
 	FILE *ifp, *ofp;
 	int ch;
 	char *prevline, *thisline, *p;
 	size_t prevlinesize, thislinesize, psize;
 	size_t prevlinecompsize, thislinecompsize;
 	setprogname(argv[0]);
 	ifp = ofp = NULL;
 	obsolete(argv);
 	while ((ch = getopt(argc, argv, "-cdf:s:u")) != -1)
 		switch (ch) {
 		case '-':
 			--optind;
 			goto done;
 		case 'c':
 			cflag = 1;
 			break;
 		case 'd':
 @@ -134,38 +135,40 @@ done:	argc -= optind;
 	thislinesize = psize;
 	if ((thisline = malloc(thislinesize + 1)) == NULL)
 		err(1, "malloc");
 	while ((p = fgetln(ifp, &psize)) != NULL) {
 		if (psize > thislinesize) {
 			if ((thisline = realloc(thisline, psize + 1)) == NULL)
 				err(1, "realloc");
 			thislinesize = psize;
+		}
 		(void)memcpy(thisline, p, psize);
 		thisline[psize] = '\0';
 		thislinecompsize = thislinesize;
 		prevlinecompsize = prevlinesize;
 		/* If requested get the chosen fields + character offsets. */
 		if (numfields || numchars) {
-			t1 = skip(thisline);
+			t1 = skip(thisline, &thislinecompsize);
-			t2 = skip(prevline);
+			t2 = skip(prevline, &prevlinecompsize);
 		} else {
 			t1 = thisline;
 			t2 = prevline;
+		}
 		/* If different, print; set previous to new value. */
-		if (strcmp(t1, t2)) {
+		if (thislinecompsize != prevlinecompsize || strcmp(t1, t2)) {
 			char *t;
 			size_t ts;
 			show(ofp, prevline);
 			t = prevline;
 			prevline = thisline;
 			thisline = t;
 			ts = prevlinesize;
 			prevlinesize = thislinesize;
 			thislinesize = ts;
 			repeats = 0;
 		} else
 			++repeats;
 @@ -185,40 +188,42 @@ static void
 show(FILE *ofp, const char *str)
+{
 	if ((dflag && repeats == 0) || (uflag && repeats > 0))
 		return;
 	if (cflag) {
 		(void)fprintf(ofp, "%4d %s", repeats + 1, str);
 	} else {
 		(void)fprintf(ofp, "%s", str);
+	}
+}
 static const char *
-skip(const char *str)
+skip(const char *str, size_t *linesize)
+{
 	int infield, nchars, nfields;
 	size_t ls = *linesize;
-	for (nfields = numfields, infield = 0; nfields && *str; ++str)
+	for (nfields = numfields, infield = 0; nfields && *str; ++str, --ls)
 		if (isspace((unsigned char)*str)) {
 			if (infield) {
 				infield = 0;
 				--nfields;
+			}
 		} else if (!infield)
 			infield = 1;
-	for (nchars = numchars; nchars-- && *str; ++str)
+	for (nchars = numchars; nchars-- && *str; ++str, --ls)
 		continue;
 	*linesize = ls;
 	return str;
+}
 static FILE *
 file(const char *name, const char *mode)
+{
 	FILE *fp;
 	if ((fp = fopen(name, mode)) == NULL)
 		err(1, "%s", name);
 	return(fp);
+}