d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare lines with strcmp(), not strcoll(). We are interested only in

Browse Source 
equality, not ordering.
This commit is contained in:
tjr 2002-06-06 03:13:08 +00:00
parent 050d703846
commit 264da240fc
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.bin/uniq/uniq.c
View File

@ -67,7 +67,6 @@ void show(FILE *, char *);
char *skip(char *);
void obsolete(char *[]);
static void usage(void);
int stricoll(char *, char*);
int
main (argc, argv)
@ -152,9 +151,9 @@ main (argc, argv)
/* If different, print; set previous to new value. */
if (iflag)
comp = stricoll(t1, t2);
comp = strcasecmp(t1, t2);
else
comp = strcoll(t1, t2);
comp = strcmp(t1, t2);
if (comp) {
show(ofp, prevline);
@ -252,18 +251,3 @@ usage()
"usage: uniq [-c | -d | -u] [-i] [-f fields] [-s chars] [input [output]]\n");
exit(1);
}
int
stricoll(s1, s2)
char *s1, *s2;
{
char *p, line1[MAXLINELEN], line2[MAXLINELEN];
for (p = line1; *s1; s1++)
*p++ = tolower((unsigned char)*s1);
*p = '\0';
for (p = line2; *s2; s2++)
*p++ = tolower((unsigned char)*s2);
*p = '\0';
return strcoll(line1, line2);
}