===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sort/sort.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- src/usr.bin/sort/sort.c	2001/01/19 17:58:18	1.15
+++ src/usr.bin/sort/sort.c	2001/02/04 21:27:01	1.16
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sort.c,v 1.15 2001/01/19 17:58:18 deraadt Exp $	*/
+/*	$OpenBSD: sort.c,v 1.16 2001/02/04 21:27:01 ericj Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)sort.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: sort.c,v 1.15 2001/01/19 17:58:18 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sort.c,v 1.16 2001/02/04 21:27:01 ericj Exp $";
 #endif
 #endif /* not lint */
 
@@ -62,6 +62,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <locale.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -119,6 +120,8 @@
 	FILE *outfp = NULL;
 	void *p;
 
+	setlocale(LC_ALL, "");
+
 	if ((clist = calloc((ND+1)*2, sizeof(struct coldesc))) == NULL ||
 	    (ftpos = fldtab = calloc(ND+2, sizeof(struct field))) == NULL)
 		errx(2, "cannot allocate memory");
@@ -331,7 +334,7 @@
 {
 	extern char *__progname;
 
-	if (msg)
+	if (msg != NULL)
 		warnx("%s", msg);
 	(void)fprintf(stderr, "usage: %s [-T dir] [-o output] [-cmubdfinrH] "
 	    "[-t char] [-R char] [-k keydef] ... [files]\n", __progname);