Module Name: src Committed By: christos Date: Tue Jan 10 21:13:45 UTC 2017
Modified Files: src/usr.bin/sort: sort.c Log Message: refactor includes, add <sys/stat.h> To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/usr.bin/sort/sort.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/sort/sort.c diff -u src/usr.bin/sort/sort.c:1.63 src/usr.bin/sort/sort.c:1.64 --- src/usr.bin/sort/sort.c:1.63 Wed Jun 1 04:24:03 2016 +++ src/usr.bin/sort/sort.c Tue Jan 10 16:13:45 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: sort.c,v 1.63 2016/06/01 08:24:03 wiz Exp $ */ +/* $NetBSD: sort.c,v 1.64 2017/01/10 21:13:45 christos Exp $ */ /*- * Copyright (c) 2000-2003 The NetBSD Foundation, Inc. @@ -60,34 +60,34 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - -/* Sort sorts a file using an optional user-defined key. - * Sort uses radix sort for internal sorting, and allows - * a choice of merge sort and radix sort for external sorting. - */ - -#include <util.h> -#include "sort.h" -#include "fsort.h" -#include "pathnames.h" - +#include <sys/cdefs.h> #ifndef lint __COPYRIGHT("@(#) Copyright (c) 1993\ The Regents of the University of California. All rights reserved."); #endif /* not lint */ +__RCSID("$NetBSD: sort.c,v 1.64 2017/01/10 21:13:45 christos Exp $"); -__RCSID("$NetBSD: sort.c,v 1.63 2016/06/01 08:24:03 wiz Exp $"); +/* Sort sorts a file using an optional user-defined key. + * Sort uses radix sort for internal sorting, and allows + * a choice of merge sort and radix sort for external sorting. + */ #include <sys/types.h> #include <sys/time.h> +#include <sys/stat.h> #include <sys/resource.h> +#include <locale.h> #include <paths.h> #include <signal.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <locale.h> +#include <util.h> + +#include "sort.h" +#include "fsort.h" +#include "pathnames.h" int REC_D = '\n'; u_char d_mask[NBINS]; /* flags for rec_d, field_d, <blank> */