Add a BSD-licensed sort rewrite that was started by me and later completed
with the major functionality and optimizations by Oleg Moskalenko. It is compatible with the latest version of POSIX and the current GNU sort version that we have in base. Beside this, it implements all the functionality introduced in later versions of GNU sort. For now, it will be installed as "bsdsort", keeping GNU sort as the default sort implementation.
This commit is contained in:
parent
01660ab3d5
commit
3c7b03ea74
45
usr.bin/sort/Makefile
Normal file
45
usr.bin/sort/Makefile
Normal file
@ -0,0 +1,45 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if ${MK_BSD_SORT} == "yes"
|
||||
PROG= sort
|
||||
.else
|
||||
PROG= bsdsort
|
||||
CLEANFILES+= bsdsort.1
|
||||
|
||||
bsdsort.1: sort.1
|
||||
cp ${.ALLSRC} ${.TARGET}
|
||||
.endif
|
||||
|
||||
SRCS= bwstring.c coll.c file.c mem.c radixsort.c sort.c vsort.c
|
||||
|
||||
WARNS= 6
|
||||
|
||||
sort.1: sort.1.in
|
||||
/usr/bin/sed ${MAN_SUB} ${.ALLSRC} >${.TARGET}
|
||||
|
||||
CLEANFILES+= sort.1
|
||||
|
||||
.if !defined(WITHOUT_THREADS)
|
||||
CFLAGS+= -DSORT_THREADS
|
||||
LDFLAGS+= -lpthread -lmd
|
||||
MAN_SUB+= -e 's|%%THREADS%%||g'
|
||||
.else
|
||||
LDFLAGS+= -lmd
|
||||
MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_NLS)
|
||||
NLS+= hu_HU.ISO8859-2
|
||||
NLSSRCFILES= ${NLS:S@$@.msg@}
|
||||
MAN_SUB+= -e 's|%%NLS%%||g'
|
||||
.for lang in ${NLS}
|
||||
NLSSRCDIR_${lang}= ${.CURDIR}/nls
|
||||
.endfor
|
||||
.else
|
||||
CFLAGS+= -DWITHOUT_NLS
|
||||
MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
|
||||
.endif
|
||||
|
||||
.include <bsd.prog.mk>
|
1138
usr.bin/sort/bwstring.c
Normal file
1138
usr.bin/sort/bwstring.c
Normal file
File diff suppressed because it is too large
Load Diff
142
usr.bin/sort/bwstring.h
Normal file
142
usr.bin/sort/bwstring.h
Normal file
@ -0,0 +1,142 @@
|
||||
/* $FreeBSD$ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
|
||||
* Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if !defined(__BWSTRING_H__)
|
||||
#define __BWSTRING_H__
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <sysexits.h>
|
||||
#include <wchar.h>
|
||||
|
||||
#include "mem.h"
|
||||
|
||||
extern bool byte_sort;
|
||||
|
||||
/* wchar_t is of 4 bytes: */
|
||||
#define SIZEOF_WCHAR_STRING(LEN) ((LEN)*sizeof(wchar_t))
|
||||
|
||||
/*
|
||||
* Binary "wide" string
|
||||
*/
|
||||
struct bwstring
|
||||
{
|
||||
size_t len;
|
||||
union
|
||||
{
|
||||
wchar_t wstr[0];
|
||||
unsigned char cstr[0];
|
||||
} data;
|
||||
};
|
||||
|
||||
struct reader_buffer
|
||||
{
|
||||
wchar_t *fgetwln_z_buffer;
|
||||
size_t fgetwln_z_buffer_size;
|
||||
};
|
||||
|
||||
typedef void *bwstring_iterator;
|
||||
|
||||
#define BWSLEN(s) ((s)->len)
|
||||
|
||||
struct bwstring *bwsalloc(size_t sz);
|
||||
|
||||
size_t bwsrawlen(const struct bwstring *bws);
|
||||
const void* bwsrawdata(const struct bwstring *bws);
|
||||
void bws_setlen(struct bwstring *bws, size_t newlen);
|
||||
size_t bws_memsize(const struct bwstring *bws);
|
||||
double bwstod(struct bwstring *s0, bool *empty);
|
||||
int bws_month_score(const struct bwstring *s0);
|
||||
|
||||
struct bwstring *ignore_leading_blanks(struct bwstring *str);
|
||||
struct bwstring *ignore_nonprinting(struct bwstring *str);
|
||||
struct bwstring *dictionary_order(struct bwstring *str);
|
||||
struct bwstring *ignore_case(struct bwstring *str);
|
||||
|
||||
void bwsprintf(FILE*, struct bwstring*, const char *prefix, const char *suffix);
|
||||
void bws_disorder_warnx(struct bwstring *s, const char *fn, size_t pos);
|
||||
|
||||
struct bwstring *bwsdup(const struct bwstring *s);
|
||||
struct bwstring *bwssbdup(const wchar_t *str, size_t size);
|
||||
struct bwstring *bwscsbdup(const unsigned char *str, size_t size);
|
||||
void bwsfree(const struct bwstring *s);
|
||||
size_t bwscpy(struct bwstring *dst, const struct bwstring *src);
|
||||
struct bwstring *bwsncpy(struct bwstring *dst, const struct bwstring *src, size_t size);
|
||||
struct bwstring *bwsnocpy(struct bwstring *dst, const struct bwstring *src, size_t offset, size_t size);
|
||||
int bwscmp(const struct bwstring *bws1, const struct bwstring *bws2, size_t offset);
|
||||
int bwsncmp(const struct bwstring *bws1, const struct bwstring *bws2, size_t offset, size_t len);
|
||||
int bwscoll(const struct bwstring *bws1, const struct bwstring *bws2, size_t offset);
|
||||
int bwsfwrite(struct bwstring *bws, FILE *f, bool zero_ended);
|
||||
struct bwstring *bwsfgetln(FILE *file, size_t *len, bool zero_ended, struct reader_buffer *rb);
|
||||
|
||||
static inline bwstring_iterator
|
||||
bws_begin(struct bwstring *bws)
|
||||
{
|
||||
|
||||
return (bwstring_iterator) (&(bws->data));
|
||||
}
|
||||
|
||||
static inline bwstring_iterator
|
||||
bws_end(struct bwstring *bws)
|
||||
{
|
||||
|
||||
return ((MB_CUR_MAX == 1) ?
|
||||
(bwstring_iterator) (bws->data.cstr + bws->len) :
|
||||
(bwstring_iterator) (bws->data.wstr + bws->len));
|
||||
}
|
||||
|
||||
static inline bwstring_iterator
|
||||
bws_iterator_inc(bwstring_iterator iter, size_t pos)
|
||||
{
|
||||
|
||||
if (MB_CUR_MAX == 1)
|
||||
return ((unsigned char *) iter) + pos;
|
||||
else
|
||||
return ((wchar_t*) iter) + pos;
|
||||
}
|
||||
|
||||
static inline wchar_t
|
||||
bws_get_iter_value(bwstring_iterator iter)
|
||||
{
|
||||
|
||||
if (MB_CUR_MAX == 1)
|
||||
return *((unsigned char *) iter);
|
||||
else
|
||||
return *((wchar_t*) iter);
|
||||
}
|
||||
|
||||
int
|
||||
bws_iterator_cmp(bwstring_iterator iter1, bwstring_iterator iter2, size_t len);
|
||||
|
||||
#define BWS_GET(bws, pos) ((MB_CUR_MAX == 1) ? ((bws)->data.cstr[(pos)]) : (bws)->data.wstr[(pos)])
|
||||
|
||||
void initialise_months(void);
|
||||
|
||||
#endif /* __BWSTRING_H__ */
|
1307
usr.bin/sort/coll.c
Normal file
1307
usr.bin/sort/coll.c
Normal file
File diff suppressed because it is too large
Load Diff
167
usr.bin/sort/coll.h
Normal file
167
usr.bin/sort/coll.h
Normal file
@ -0,0 +1,167 @@
|
||||
/* $FreeBSD$ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
|
||||
* Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if !defined(__COLL_H__)
|
||||
#define __COLL_H__
|
||||
|
||||
#include "bwstring.h"
|
||||
#include "sort.h"
|
||||
|
||||
/*
|
||||
* Sort hint data for -n
|
||||
*/
|
||||
struct n_hint
|
||||
{
|
||||
unsigned long long n1;
|
||||
unsigned char si;
|
||||
bool empty;
|
||||
bool neg;
|
||||
};
|
||||
|
||||
/*
|
||||
* Sort hint data for -g
|
||||
*/
|
||||
struct g_hint
|
||||
{
|
||||
double d;
|
||||
bool nan;
|
||||
bool notnum;
|
||||
};
|
||||
|
||||
/*
|
||||
* Sort hint data for -M
|
||||
*/
|
||||
struct M_hint
|
||||
{
|
||||
int m;
|
||||
};
|
||||
|
||||
/*
|
||||
* Status of a sort hint object
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
HS_ERROR = -1, HS_UNINITIALIZED = 0, HS_INITIALIZED = 1
|
||||
} hint_status;
|
||||
|
||||
/*
|
||||
* Sort hint object
|
||||
*/
|
||||
struct key_hint
|
||||
{
|
||||
hint_status status;
|
||||
union
|
||||
{
|
||||
struct n_hint nh;
|
||||
struct g_hint gh;
|
||||
struct M_hint Mh;
|
||||
} v;
|
||||
};
|
||||
|
||||
/*
|
||||
* Key value
|
||||
*/
|
||||
struct key_value
|
||||
{
|
||||
struct bwstring *k; /* key string */
|
||||
struct key_hint hint[0]; /* key sort hint */
|
||||
};
|
||||
|
||||
/*
|
||||
* Set of keys container object.
|
||||
*/
|
||||
struct keys_array
|
||||
{
|
||||
struct key_value key[0];
|
||||
};
|
||||
|
||||
/*
|
||||
* Parsed -k option data
|
||||
*/
|
||||
struct key_specs
|
||||
{
|
||||
struct sort_mods sm;
|
||||
size_t c1;
|
||||
size_t c2;
|
||||
size_t f1;
|
||||
size_t f2;
|
||||
bool pos1b;
|
||||
bool pos2b;
|
||||
};
|
||||
|
||||
/*
|
||||
* Single entry in sort list.
|
||||
*/
|
||||
struct sort_list_item
|
||||
{
|
||||
struct bwstring *str;
|
||||
struct keys_array ka;
|
||||
};
|
||||
|
||||
/*
|
||||
* Function type, used to compare two list objects
|
||||
*/
|
||||
typedef int (*listcoll_t)(struct sort_list_item **ss1, struct sort_list_item **ss2);
|
||||
|
||||
extern struct key_specs *keys;
|
||||
extern size_t keys_num;
|
||||
|
||||
/*
|
||||
* Main localised symbols
|
||||
*/
|
||||
extern wchar_t symbol_decimal_point;
|
||||
extern wchar_t symbol_thousands_sep;
|
||||
extern wchar_t symbol_negative_sign;
|
||||
extern wchar_t symbol_positive_sign;
|
||||
|
||||
/* funcs */
|
||||
|
||||
cmpcoll_t get_sort_func(struct sort_mods *sm);
|
||||
|
||||
struct keys_array *keys_array_alloc(void);
|
||||
size_t keys_array_size(void);
|
||||
void set_key_on_keys_array(struct keys_array *ka, struct bwstring *s, size_t ind);
|
||||
void clean_keys_array(const struct bwstring *s, struct keys_array *ka);
|
||||
|
||||
struct sort_list_item *sort_list_item_alloc(void);
|
||||
void sort_list_item_set(struct sort_list_item *si, struct bwstring *str);
|
||||
void sort_list_item_clean(struct sort_list_item *si);
|
||||
size_t sort_list_item_size(struct sort_list_item *si);
|
||||
|
||||
int preproc(struct bwstring *s, struct keys_array *ka);
|
||||
int top_level_str_coll(const struct bwstring *, const struct bwstring *);
|
||||
int key_coll(struct keys_array *ks1, struct keys_array *ks2, size_t offset);
|
||||
int str_list_coll(struct bwstring *str1, struct sort_list_item **ss2);
|
||||
int list_coll_by_str_only(struct sort_list_item **ss1, struct sort_list_item **ss2);
|
||||
int list_coll(struct sort_list_item **ss1, struct sort_list_item **ss2);
|
||||
int list_coll_offset(struct sort_list_item **ss1, struct sort_list_item **ss2, size_t offset);
|
||||
|
||||
listcoll_t get_list_call_func(size_t offset);
|
||||
|
||||
#endif /* __COLL_H__ */
|
1615
usr.bin/sort/file.c
Normal file
1615
usr.bin/sort/file.c
Normal file
File diff suppressed because it is too large
Load Diff
132
usr.bin/sort/file.h
Normal file
132
usr.bin/sort/file.h
Normal file
@ -0,0 +1,132 @@
|
||||
/* $FreeBSD$ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
|
||||
* Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if !defined(__SORT_FILE_H__)
|
||||
#define __SORT_FILE_H__
|
||||
|
||||
#include "coll.h"
|
||||
#include "sort.h"
|
||||
|
||||
#define SORT_DEFAULT 0
|
||||
#define SORT_QSORT 1
|
||||
#define SORT_MERGESORT 2
|
||||
#define SORT_HEAPSORT 3
|
||||
#define SORT_RADIXSORT 4
|
||||
|
||||
/*
|
||||
* List of data to be sorted.
|
||||
*/
|
||||
struct sort_list
|
||||
{
|
||||
struct sort_list_item **list;
|
||||
unsigned long long memsize;
|
||||
size_t count;
|
||||
size_t size;
|
||||
size_t sub_list_pos;
|
||||
};
|
||||
|
||||
/*
|
||||
* File reader object
|
||||
*/
|
||||
struct file_reader;
|
||||
|
||||
/*
|
||||
* List of files to be sorted
|
||||
*/
|
||||
struct file_list
|
||||
{
|
||||
char **fns;
|
||||
int count;
|
||||
int sz;
|
||||
bool tmp;
|
||||
};
|
||||
|
||||
/*
|
||||
* Structure for zero-separated file reading (for input files list)
|
||||
*/
|
||||
struct file0_reader
|
||||
{
|
||||
char *current_line;
|
||||
FILE *f;
|
||||
size_t current_sz;
|
||||
};
|
||||
|
||||
/* memory */
|
||||
|
||||
/**/
|
||||
|
||||
extern unsigned long long free_memory;
|
||||
extern unsigned long long available_free_memory;
|
||||
|
||||
/* temporary file dir */
|
||||
|
||||
extern const char *tmpdir;
|
||||
|
||||
/*
|
||||
* Max number of simultaneously open files (including the output file).
|
||||
*/
|
||||
extern size_t max_open_files;
|
||||
|
||||
/*
|
||||
* Compress program
|
||||
*/
|
||||
extern const char* compress_program;
|
||||
|
||||
/* funcs */
|
||||
|
||||
struct file_reader *file_reader_init(const char *fsrc);
|
||||
struct bwstring *file_reader_readline(struct file_reader *fr);
|
||||
void file_reader_free(struct file_reader *fr);
|
||||
|
||||
char *read_file0_line(struct file0_reader *f0r);
|
||||
|
||||
void init_tmp_files(void);
|
||||
void clear_tmp_files(void);
|
||||
char *new_tmp_file_name(void);
|
||||
void tmp_file_atexit(const char *tmp_file);
|
||||
|
||||
void file_list_init(struct file_list *fl, bool tmp);
|
||||
void file_list_add(struct file_list *fl, char *fn, bool allocate);
|
||||
void file_list_populate(struct file_list *fl, int argc, char **argv, bool allocate);
|
||||
void file_list_clean(struct file_list *fl);
|
||||
|
||||
int check(const char *);
|
||||
void merge_files(struct file_list *fl, const char *fn_out);
|
||||
FILE *openfile(const char *, const char *);
|
||||
void closefile(FILE *, const char *);
|
||||
int procfile(const char *fn, struct sort_list *list, struct file_list *fl);
|
||||
|
||||
void sort_list_init(struct sort_list *l);
|
||||
void sort_list_add(struct sort_list *l, struct bwstring *str);
|
||||
void sort_list_clean(struct sort_list *l);
|
||||
void sort_list_dump(struct sort_list *l, const char *fn);
|
||||
|
||||
void sort_list_to_file(struct sort_list *list, const char *outfile);
|
||||
|
||||
#endif /* __SORT_FILE_H__ */
|
82
usr.bin/sort/mem.c
Normal file
82
usr.bin/sort/mem.c
Normal file
@ -0,0 +1,82 @@
|
||||
/*-
|
||||
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
|
||||
* Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <err.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "mem.h"
|
||||
|
||||
/*
|
||||
* malloc() wrapper.
|
||||
*/
|
||||
void *
|
||||
sort_malloc(size_t size)
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
if ((ptr = malloc(size)) == NULL)
|
||||
err(2, NULL);
|
||||
return (ptr);
|
||||
}
|
||||
|
||||
/*
|
||||
* free() wrapper.
|
||||
*/
|
||||
void
|
||||
sort_free(const void *ptr)
|
||||
{
|
||||
|
||||
if (ptr)
|
||||
free(__DECONST(void *, ptr));
|
||||
}
|
||||
|
||||
/*
|
||||
* realloc() wrapper.
|
||||
*/
|
||||
void *
|
||||
sort_realloc(void *ptr, size_t size)
|
||||
{
|
||||
|
||||
if ((ptr = realloc(ptr, size)) == NULL)
|
||||
err(2, NULL);
|
||||
return (ptr);
|
||||
}
|
||||
|
||||
char *
|
||||
sort_strdup(const char *str)
|
||||
{
|
||||
char *dup;
|
||||
|
||||
if ((dup = strdup(str)) == NULL)
|
||||
err(2, NULL);
|
||||
return (dup);
|
||||
}
|
45
usr.bin/sort/mem.h
Normal file
45
usr.bin/sort/mem.h
Normal file
@ -0,0 +1,45 @@
|
||||
/* $FreeBSD$ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
|
||||
* Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if !defined(__SORT_MEM_H__)
|
||||
#define __SORT_MEM_H__
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
/*
|
||||
* mem.c
|
||||
*/
|
||||
void *sort_malloc(size_t);
|
||||
void sort_free(const void *ptr);
|
||||
void *sort_realloc(void *, size_t);
|
||||
char *sort_strdup(const char *);
|
||||
|
||||
#endif /* __SORT_MEM_H__ */
|
10
usr.bin/sort/nls/C.msg
Normal file
10
usr.bin/sort/nls/C.msg
Normal file
@ -0,0 +1,10 @@
|
||||
$ $FreeBSD$
|
||||
$
|
||||
$set 1
|
||||
$quote "
|
||||
1 "you cannot use -%c and -%c together"
|
||||
2 "extra argument not allowed with -c"
|
||||
3 "Unknown feature: %s\n"
|
||||
4 "Wrong memory buffer specification"
|
||||
5 "0 field in key specs\n"
|
||||
6 "0 column in key specs\n"
|
10
usr.bin/sort/nls/hu_HU.ISO8859-2.msg
Normal file
10
usr.bin/sort/nls/hu_HU.ISO8859-2.msg
Normal file
@ -0,0 +1,10 @@
|
||||
$ $FreeBSD$
|
||||
$
|
||||
$set 1
|
||||
$quote "
|
||||
1 "a -%c és -%c opciók nem használhatók együtt"
|
||||
2 "extra argumentum a -%c opcióval"
|
||||
3 "Ismeretlen funkció: %s\n"
|
||||
4 "Rossz memória puffer érték"
|
||||
5 "0 mező a kulcsspecifikációban\n"
|
||||
6 "0 oszlop a kulcsspecifikációban\n"
|
674
usr.bin/sort/radixsort.c
Normal file
674
usr.bin/sort/radixsort.c
Normal file
@ -0,0 +1,674 @@
|
||||
/*-
|
||||
* Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <errno.h>
|
||||
#include <err.h>
|
||||
#include <langinfo.h>
|
||||
#include <math.h>
|
||||
#if defined(SORT_THREADS)
|
||||
#include <pthread.h>
|
||||
#include <semaphore.h>
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <wchar.h>
|
||||
#include <wctype.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "coll.h"
|
||||
#include "radixsort.h"
|
||||
|
||||
#define TINY_NODE(sl) ((sl)->tosort_num < 65)
|
||||
#define SMALL_NODE(sl) ((sl)->tosort_num < 5)
|
||||
|
||||
/* are we sorting in reverse order ? */
|
||||
static bool reverse_sort = false;
|
||||
|
||||
/* sort sub-levels array size */
|
||||
static const size_t slsz = 256 * sizeof(struct sort_level*);
|
||||
|
||||
/* one sort level structure */
|
||||
struct sort_level
|
||||
{
|
||||
struct sort_level **sublevels;
|
||||
struct sort_list_item **leaves;
|
||||
struct sort_list_item **sorted;
|
||||
struct sort_list_item **tosort;
|
||||
size_t leaves_num;
|
||||
size_t leaves_sz;
|
||||
size_t level;
|
||||
size_t real_sln;
|
||||
size_t start_position;
|
||||
size_t sln;
|
||||
size_t tosort_num;
|
||||
size_t tosort_sz;
|
||||
};
|
||||
|
||||
/* stack of sort levels ready to be sorted */
|
||||
struct level_stack {
|
||||
struct level_stack *next;
|
||||
struct sort_level *sl;
|
||||
};
|
||||
|
||||
static struct level_stack *g_ls = NULL;
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
/* stack guarding mutex */
|
||||
static pthread_mutex_t g_ls_mutex;
|
||||
|
||||
/* counter: how many items are left */
|
||||
static size_t sort_left = 0;
|
||||
/* guarding mutex */
|
||||
static pthread_mutex_t sort_left_mutex;
|
||||
|
||||
/* semaphore to count threads */
|
||||
static sem_t mtsem;
|
||||
|
||||
/*
|
||||
* Decrement items counter
|
||||
*/
|
||||
static inline void
|
||||
sort_left_dec(size_t n)
|
||||
{
|
||||
|
||||
pthread_mutex_lock(&sort_left_mutex);
|
||||
sort_left -= n;
|
||||
pthread_mutex_unlock(&sort_left_mutex);
|
||||
}
|
||||
|
||||
/*
|
||||
* Do we have something to sort ?
|
||||
*/
|
||||
static inline bool
|
||||
have_sort_left(void)
|
||||
{
|
||||
bool ret;
|
||||
|
||||
pthread_mutex_lock(&sort_left_mutex);
|
||||
ret = (sort_left > 0);
|
||||
pthread_mutex_unlock(&sort_left_mutex);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#define sort_left_dec(n)
|
||||
|
||||
#endif /* SORT_THREADS */
|
||||
|
||||
/*
|
||||
* Push sort level to the stack
|
||||
*/
|
||||
static inline void
|
||||
push_ls(struct sort_level* sl)
|
||||
{
|
||||
struct level_stack *new_ls;
|
||||
|
||||
new_ls = sort_malloc(sizeof(struct level_stack));
|
||||
new_ls->sl = sl;
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
if (nthreads > 1)
|
||||
pthread_mutex_lock(&g_ls_mutex);
|
||||
#endif
|
||||
|
||||
new_ls->next = g_ls;
|
||||
g_ls = new_ls;
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
if (nthreads > 1)
|
||||
pthread_mutex_unlock(&g_ls_mutex);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
* Pop sort level from the stack (single-threaded style)
|
||||
*/
|
||||
static inline struct sort_level*
|
||||
pop_ls_st(void)
|
||||
{
|
||||
struct sort_level *sl;
|
||||
|
||||
if (g_ls) {
|
||||
struct level_stack *saved_ls;
|
||||
|
||||
sl = g_ls->sl;
|
||||
saved_ls = g_ls;
|
||||
g_ls = g_ls->next;
|
||||
sort_free(saved_ls);
|
||||
} else
|
||||
sl = NULL;
|
||||
|
||||
return (sl);
|
||||
}
|
||||
|
||||
/*
|
||||
* Pop sort level from the stack (multi-threaded style)
|
||||
*/
|
||||
static inline struct sort_level*
|
||||
pop_ls_mt(void)
|
||||
{
|
||||
struct level_stack *saved_ls;
|
||||
struct sort_level *sl;
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
pthread_mutex_lock(&g_ls_mutex);
|
||||
#endif
|
||||
|
||||
if (g_ls) {
|
||||
sl = g_ls->sl;
|
||||
saved_ls = g_ls;
|
||||
g_ls = g_ls->next;
|
||||
} else {
|
||||
sl = NULL;
|
||||
saved_ls = NULL;
|
||||
}
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
pthread_mutex_unlock(&g_ls_mutex);
|
||||
#endif
|
||||
|
||||
sort_free(saved_ls);
|
||||
|
||||
return (sl);
|
||||
}
|
||||
|
||||
static void
|
||||
add_to_sublevel(struct sort_level *sl, struct sort_list_item *item, int indx)
|
||||
{
|
||||
struct sort_level *ssl;
|
||||
|
||||
ssl = sl->sublevels[indx];
|
||||
|
||||
if (ssl == NULL) {
|
||||
ssl = sort_malloc(sizeof(struct sort_level));
|
||||
memset(ssl, 0, sizeof(struct sort_level));
|
||||
|
||||
ssl->level = sl->level + 1;
|
||||
sl->sublevels[indx] = ssl;
|
||||
|
||||
++(sl->real_sln);
|
||||
}
|
||||
|
||||
if (++(ssl->tosort_num) > ssl->tosort_sz) {
|
||||
ssl->tosort_sz = ssl->tosort_num + 128;
|
||||
ssl->tosort = sort_realloc(ssl->tosort,
|
||||
sizeof(struct sort_list_item*) * (ssl->tosort_sz));
|
||||
}
|
||||
|
||||
ssl->tosort[ssl->tosort_num - 1] = item;
|
||||
}
|
||||
|
||||
static inline void
|
||||
add_leaf(struct sort_level *sl, struct sort_list_item *item)
|
||||
{
|
||||
|
||||
if (++(sl->leaves_num) > sl->leaves_sz) {
|
||||
sl->leaves_sz = sl->leaves_num + 128;
|
||||
sl->leaves = sort_realloc(sl->leaves,
|
||||
(sizeof(struct sort_list_item*) * (sl->leaves_sz)));
|
||||
}
|
||||
sl->leaves[sl->leaves_num - 1] = item;
|
||||
}
|
||||
|
||||
static inline int
|
||||
get_wc_index(struct sort_list_item *sli, size_t level)
|
||||
{
|
||||
const struct bwstring *bws;
|
||||
|
||||
bws = sli->ka.key[0].k;
|
||||
|
||||
if ((BWSLEN(bws) > level))
|
||||
return (unsigned char) BWS_GET(bws,level);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
static void
|
||||
place_item(struct sort_level *sl, size_t item)
|
||||
{
|
||||
struct sort_list_item *sli;
|
||||
int c;
|
||||
|
||||
sli = sl->tosort[item];
|
||||
c = get_wc_index(sli, sl->level);
|
||||
|
||||
if (c == -1)
|
||||
add_leaf(sl, sli);
|
||||
else
|
||||
add_to_sublevel(sl, sli, c);
|
||||
}
|
||||
|
||||
static void
|
||||
free_sort_level(struct sort_level *sl)
|
||||
{
|
||||
|
||||
if (sl) {
|
||||
if (sl->leaves)
|
||||
sort_free(sl->leaves);
|
||||
|
||||
if (sl->level > 0)
|
||||
sort_free(sl->tosort);
|
||||
|
||||
if (sl->sublevels) {
|
||||
struct sort_level *slc;
|
||||
size_t sln;
|
||||
|
||||
sln = sl->sln;
|
||||
|
||||
for (size_t i = 0; i < sln; ++i) {
|
||||
slc = sl->sublevels[i];
|
||||
if (slc)
|
||||
free_sort_level(slc);
|
||||
}
|
||||
|
||||
sort_free(sl->sublevels);
|
||||
}
|
||||
|
||||
sort_free(sl);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
run_sort_level_next(struct sort_level *sl)
|
||||
{
|
||||
struct sort_level *slc;
|
||||
size_t i, sln, tosort_num;
|
||||
|
||||
if (sl->sublevels) {
|
||||
sort_free(sl->sublevels);
|
||||
sl->sublevels = NULL;
|
||||
}
|
||||
|
||||
switch (sl->tosort_num){
|
||||
case 0:
|
||||
goto end;
|
||||
case (1):
|
||||
sl->sorted[sl->start_position] = sl->tosort[0];
|
||||
sort_left_dec(1);
|
||||
goto end;
|
||||
case (2):
|
||||
if (list_coll_offset(&(sl->tosort[0]), &(sl->tosort[1]),
|
||||
sl->level) > 0) {
|
||||
sl->sorted[sl->start_position++] = sl->tosort[1];
|
||||
sl->sorted[sl->start_position] = sl->tosort[0];
|
||||
} else {
|
||||
sl->sorted[sl->start_position++] = sl->tosort[0];
|
||||
sl->sorted[sl->start_position] = sl->tosort[1];
|
||||
}
|
||||
sort_left_dec(2);
|
||||
|
||||
goto end;
|
||||
default:
|
||||
if (TINY_NODE(sl) || (sl->level > 15)) {
|
||||
listcoll_t func;
|
||||
|
||||
func = get_list_call_func(sl->level);
|
||||
|
||||
sl->leaves = sl->tosort;
|
||||
sl->leaves_num = sl->tosort_num;
|
||||
sl->leaves_sz = sl->leaves_num;
|
||||
sl->leaves = sort_realloc(sl->leaves,
|
||||
(sizeof(struct sort_list_item *) *
|
||||
(sl->leaves_sz)));
|
||||
sl->tosort = NULL;
|
||||
sl->tosort_num = 0;
|
||||
sl->tosort_sz = 0;
|
||||
sl->sln = 0;
|
||||
sl->real_sln = 0;
|
||||
if (sort_opts_vals.sflag) {
|
||||
if (mergesort(sl->leaves, sl->leaves_num,
|
||||
sizeof(struct sort_list_item *),
|
||||
(int(*)(const void *, const void *)) func) == -1)
|
||||
/* NOTREACHED */
|
||||
err(2, "Radix sort error 3");
|
||||
} else
|
||||
qsort(sl->leaves, sl->leaves_num,
|
||||
sizeof(struct sort_list_item *),
|
||||
(int(*)(const void *, const void *)) func);
|
||||
|
||||
memcpy(sl->sorted + sl->start_position,
|
||||
sl->leaves, sl->leaves_num *
|
||||
sizeof(struct sort_list_item*));
|
||||
|
||||
sort_left_dec(sl->leaves_num);
|
||||
|
||||
goto end;
|
||||
} else {
|
||||
sl->tosort_sz = sl->tosort_num;
|
||||
sl->tosort = sort_realloc(sl->tosort,
|
||||
sizeof(struct sort_list_item*) * (sl->tosort_sz));
|
||||
}
|
||||
}
|
||||
|
||||
sl->sln = 256;
|
||||
sl->sublevels = sort_malloc(slsz);
|
||||
memset(sl->sublevels, 0, slsz);
|
||||
|
||||
sl->real_sln = 0;
|
||||
|
||||
tosort_num = sl->tosort_num;
|
||||
for (i = 0; i < tosort_num; ++i)
|
||||
place_item(sl, i);
|
||||
|
||||
sort_free(sl->tosort);
|
||||
sl->tosort = NULL;
|
||||
sl->tosort_num = 0;
|
||||
sl->tosort_sz = 0;
|
||||
|
||||
if (sl->leaves_num > 1) {
|
||||
if (keys_num > 1) {
|
||||
if (sort_opts_vals.sflag) {
|
||||
mergesort(sl->leaves, sl->leaves_num,
|
||||
sizeof(struct sort_list_item *),
|
||||
(int(*)(const void *, const void *)) list_coll);
|
||||
} else {
|
||||
qsort(sl->leaves, sl->leaves_num,
|
||||
sizeof(struct sort_list_item *),
|
||||
(int(*)(const void *, const void *)) list_coll);
|
||||
}
|
||||
} else if (!sort_opts_vals.sflag && sort_opts_vals.complex_sort) {
|
||||
qsort(sl->leaves, sl->leaves_num,
|
||||
sizeof(struct sort_list_item *),
|
||||
(int(*)(const void *, const void *)) list_coll_by_str_only);
|
||||
}
|
||||
}
|
||||
|
||||
sl->leaves_sz = sl->leaves_num;
|
||||
sl->leaves = sort_realloc(sl->leaves, (sizeof(struct sort_list_item *) *
|
||||
(sl->leaves_sz)));
|
||||
|
||||
if (!reverse_sort) {
|
||||
memcpy(sl->sorted + sl->start_position, sl->leaves,
|
||||
sl->leaves_num * sizeof(struct sort_list_item*));
|
||||
sl->start_position += sl->leaves_num;
|
||||
sort_left_dec(sl->leaves_num);
|
||||
|
||||
sort_free(sl->leaves);
|
||||
sl->leaves = NULL;
|
||||
sl->leaves_num = 0;
|
||||
sl->leaves_sz = 0;
|
||||
|
||||
sln = sl->sln;
|
||||
|
||||
for (i = 0; i < sln; ++i) {
|
||||
slc = sl->sublevels[i];
|
||||
|
||||
if (slc) {
|
||||
slc->sorted = sl->sorted;
|
||||
slc->start_position = sl->start_position;
|
||||
sl->start_position += slc->tosort_num;
|
||||
if (SMALL_NODE(slc))
|
||||
run_sort_level_next(slc);
|
||||
else
|
||||
push_ls(slc);
|
||||
sl->sublevels[i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
size_t n;
|
||||
|
||||
sln = sl->sln;
|
||||
|
||||
for (i = 0; i < sln; ++i) {
|
||||
n = sln - i - 1;
|
||||
slc = sl->sublevels[n];
|
||||
|
||||
if (slc) {
|
||||
slc->sorted = sl->sorted;
|
||||
slc->start_position = sl->start_position;
|
||||
sl->start_position += slc->tosort_num;
|
||||
if (SMALL_NODE(slc))
|
||||
run_sort_level_next(slc);
|
||||
else
|
||||
push_ls(slc);
|
||||
sl->sublevels[n] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
memcpy(sl->sorted + sl->start_position, sl->leaves,
|
||||
sl->leaves_num * sizeof(struct sort_list_item*));
|
||||
sort_left_dec(sl->leaves_num);
|
||||
}
|
||||
|
||||
end:
|
||||
free_sort_level(sl);
|
||||
}
|
||||
|
||||
/*
|
||||
* Single-threaded sort cycle
|
||||
*/
|
||||
static void
|
||||
run_sort_cycle_st(void)
|
||||
{
|
||||
struct sort_level *slc;
|
||||
|
||||
for (;;) {
|
||||
slc = pop_ls_st();
|
||||
if (slc == NULL) {
|
||||
break;
|
||||
}
|
||||
run_sort_level_next(slc);
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
|
||||
/*
|
||||
* Multi-threaded sort cycle
|
||||
*/
|
||||
static void
|
||||
run_sort_cycle_mt(void)
|
||||
{
|
||||
struct sort_level *slc;
|
||||
|
||||
for (;;) {
|
||||
slc = pop_ls_mt();
|
||||
if (slc == NULL) {
|
||||
if (have_sort_left()) {
|
||||
pthread_yield();
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
run_sort_level_next(slc);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Sort cycle thread (in multi-threaded mode)
|
||||
*/
|
||||
static void*
|
||||
sort_thread(void* arg)
|
||||
{
|
||||
|
||||
run_sort_cycle_mt();
|
||||
|
||||
sem_post(&mtsem);
|
||||
|
||||
return (arg);
|
||||
}
|
||||
|
||||
#endif /* defined(SORT_THREADS) */
|
||||
|
||||
static void
|
||||
run_top_sort_level(struct sort_level *sl)
|
||||
{
|
||||
struct sort_level *slc;
|
||||
|
||||
reverse_sort = sort_opts_vals.kflag ? keys[0].sm.rflag :
|
||||
default_sort_mods->rflag;
|
||||
|
||||
sl->start_position = 0;
|
||||
sl->sln = 256;
|
||||
sl->sublevels = sort_malloc(slsz);
|
||||
memset(sl->sublevels, 0, slsz);
|
||||
|
||||
for (size_t i = 0; i < sl->tosort_num; ++i)
|
||||
place_item(sl, i);
|
||||
|
||||
if (sl->leaves_num > 1) {
|
||||
if (keys_num > 1) {
|
||||
if (sort_opts_vals.sflag) {
|
||||
mergesort(sl->leaves, sl->leaves_num,
|
||||
sizeof(struct sort_list_item *),
|
||||
(int(*)(const void *, const void *)) list_coll);
|
||||
} else {
|
||||
qsort(sl->leaves, sl->leaves_num,
|
||||
sizeof(struct sort_list_item *),
|
||||
(int(*)(const void *, const void *)) list_coll);
|
||||
}
|
||||
} else if (!sort_opts_vals.sflag && sort_opts_vals.complex_sort) {
|
||||
qsort(sl->leaves, sl->leaves_num,
|
||||
sizeof(struct sort_list_item *),
|
||||
(int(*)(const void *, const void *)) list_coll_by_str_only);
|
||||
}
|
||||
}
|
||||
|
||||
if (!reverse_sort) {
|
||||
memcpy(sl->tosort + sl->start_position, sl->leaves,
|
||||
sl->leaves_num * sizeof(struct sort_list_item*));
|
||||
sl->start_position += sl->leaves_num;
|
||||
sort_left_dec(sl->leaves_num);
|
||||
|
||||
for (size_t i = 0; i < sl->sln; ++i) {
|
||||
slc = sl->sublevels[i];
|
||||
|
||||
if (slc) {
|
||||
slc->sorted = sl->tosort;
|
||||
slc->start_position = sl->start_position;
|
||||
sl->start_position += slc->tosort_num;
|
||||
push_ls(slc);
|
||||
sl->sublevels[i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
size_t n;
|
||||
|
||||
for (size_t i = 0; i < sl->sln; ++i) {
|
||||
|
||||
n = sl->sln - i - 1;
|
||||
slc = sl->sublevels[n];
|
||||
|
||||
if (slc) {
|
||||
slc->sorted = sl->tosort;
|
||||
slc->start_position = sl->start_position;
|
||||
sl->start_position += slc->tosort_num;
|
||||
push_ls(slc);
|
||||
sl->sublevels[n] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
memcpy(sl->tosort + sl->start_position, sl->leaves,
|
||||
sl->leaves_num * sizeof(struct sort_list_item*));
|
||||
|
||||
sort_left_dec(sl->leaves_num);
|
||||
}
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
if (nthreads < 2) {
|
||||
#endif
|
||||
run_sort_cycle_st();
|
||||
#if defined(SORT_THREADS)
|
||||
} else {
|
||||
size_t i;
|
||||
|
||||
for(i = 0; i < nthreads; ++i) {
|
||||
pthread_attr_t attr;
|
||||
pthread_t pth;
|
||||
|
||||
pthread_attr_init(&attr);
|
||||
pthread_attr_setdetachstate(&attr,
|
||||
PTHREAD_DETACHED);
|
||||
|
||||
pthread_create(&pth, &attr, sort_thread, NULL);
|
||||
|
||||
pthread_attr_destroy(&attr);
|
||||
}
|
||||
|
||||
for(i = 0; i < nthreads; ++i)
|
||||
sem_wait(&mtsem);
|
||||
}
|
||||
#endif /* defined(SORT_THREADS) */
|
||||
}
|
||||
|
||||
static void
|
||||
run_sort(struct sort_list_item **base, size_t nmemb)
|
||||
{
|
||||
struct sort_level *sl;
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
if (nthreads > 1) {
|
||||
pthread_mutexattr_t mattr;
|
||||
|
||||
pthread_mutexattr_init(&mattr);
|
||||
pthread_mutexattr_settype(&mattr, PTHREAD_MUTEX_ADAPTIVE_NP);
|
||||
|
||||
pthread_mutex_init(&g_ls_mutex, &mattr);
|
||||
pthread_mutex_init(&sort_left_mutex, &mattr);
|
||||
|
||||
pthread_mutexattr_destroy(&mattr);
|
||||
|
||||
sem_init(&mtsem, 0, 0);
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
sl = sort_malloc(sizeof(struct sort_level));
|
||||
memset(sl, 0, sizeof(struct sort_level));
|
||||
|
||||
sl->tosort = base;
|
||||
sl->tosort_num = nmemb;
|
||||
sl->tosort_sz = nmemb;
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
sort_left = nmemb;
|
||||
#endif
|
||||
|
||||
run_top_sort_level(sl);
|
||||
|
||||
free_sort_level(sl);
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
if (nthreads > 1) {
|
||||
sem_destroy(&mtsem);
|
||||
pthread_mutex_destroy(&g_ls_mutex);
|
||||
pthread_mutex_destroy(&sort_left_mutex);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
rxsort(struct sort_list_item **base, size_t nmemb)
|
||||
{
|
||||
|
||||
run_sort(base, nmemb);
|
||||
}
|
38
usr.bin/sort/radixsort.h
Normal file
38
usr.bin/sort/radixsort.h
Normal file
@ -0,0 +1,38 @@
|
||||
/* $FreeBSD$ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if !defined(__SORT_RADIX_H__)
|
||||
#define __SORT_RADIX_H__
|
||||
|
||||
#include "coll.h"
|
||||
#include "sort.h"
|
||||
|
||||
void rxsort(struct sort_list_item **base, size_t nmemb);
|
||||
|
||||
#endif /* __SORT_RADIX_H__ */
|
635
usr.bin/sort/sort.1.in
Normal file
635
usr.bin/sort/sort.1.in
Normal file
@ -0,0 +1,635 @@
|
||||
.\" $OpenBSD: sort.1,v 1.31 2007/08/21 21:22:37 millert Exp $
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.\" Copyright (c) 1991, 1993
|
||||
.\" The Regents of the University of California. All rights reserved.
|
||||
.\"
|
||||
.\" This code is derived from software contributed to Berkeley by
|
||||
.\" the Institute of Electrical and Electronics Engineers, Inc.
|
||||
.\"
|
||||
.\" 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.
|
||||
.\" 2. Redistributions in binary form must reproduce the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer in the
|
||||
.\" documentation and/or other materials provided with the distribution.
|
||||
.\" 3. Neither the name of the University nor the names of its contributors
|
||||
.\" may be used to endorse or promote products derived from this software
|
||||
.\" without specific prior written permission.
|
||||
.\"
|
||||
.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" @(#)sort.1 8.1 (Berkeley) 6/6/93
|
||||
.\"
|
||||
.Dd May 6, 2012
|
||||
.Dt SORT 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm sort
|
||||
.Nd sort or merge records (lines) of text and binary files
|
||||
.Sh SYNOPSIS
|
||||
.Nm sort
|
||||
.Bk -words
|
||||
.Op Fl bcCdfghiRMmnrsuVz
|
||||
.Sm off
|
||||
.Op Fl k\ \& Ar field1 Op , Ar field2
|
||||
.Sm on
|
||||
.Op Fl S Ar memsize
|
||||
.Ek
|
||||
.Op Fl T Ar dir
|
||||
.Op Fl t Ar char
|
||||
.Op Fl o Ar output
|
||||
.Op Ar file ...
|
||||
.Nm sort
|
||||
.Fl Fl help
|
||||
.Nm sort
|
||||
.Fl Fl version
|
||||
.Sh DESCRIPTION
|
||||
The
|
||||
.Nm
|
||||
utility sorts text and binary files by lines.
|
||||
A line is a record separated from the subsequent record by a
|
||||
newline (default) or NUL \'\\0\' character (-z option).
|
||||
A record can contain any printable or unprintable characters.
|
||||
Comparisons are based on one or more sort keys extracted from
|
||||
each line of input, and are performed lexicographically,
|
||||
according to the current locale's collating rules and the
|
||||
specified command-line options that can tune the actual
|
||||
sorting behavior.
|
||||
By default, if keys are not given,
|
||||
.Nm
|
||||
uses entire lines for comparison.
|
||||
.Pp
|
||||
The command line options are as follows:
|
||||
.Bl -tag -width Ds
|
||||
.It Fl c, Fl Fl check, Fl C, Fl Fl check=silent|quiet
|
||||
Check that the single input file is sorted.
|
||||
If the file is not sorted,
|
||||
.Nm
|
||||
produces the appropriate error messages and exits with code 1,
|
||||
otherwise returns 0.
|
||||
If
|
||||
.Fl C
|
||||
or
|
||||
.Fl Fl check=silent
|
||||
is specified,
|
||||
.Nm
|
||||
produces no output.
|
||||
This is a "silent" version of
|
||||
.Fl c.
|
||||
.It Fl m , Fl Fl merge
|
||||
Merge only.
|
||||
The input files are assumed to be pre-sorted.
|
||||
If they are not sorted the output order is undefined.
|
||||
.It Fl o Ar output , Fl Fl output Ns = Ns Ar output
|
||||
Print the output to the
|
||||
.Ar output
|
||||
file instead of the standard output.
|
||||
.It Fl S Ar size, Fl Fl buffer-size Ns = Ns Ar size
|
||||
Use
|
||||
.Ar size
|
||||
for the maximum size of the memory buffer.
|
||||
Size modifiers %,b,K,M,G,T,P,E,Z,Y can be used.
|
||||
If a memory limit is not explicitly specified,
|
||||
.Nm
|
||||
takes up to about 90% of available memory.
|
||||
If the file size is too big to fit into the memory buffer,
|
||||
the temporary disk files are used to perform the sorting.
|
||||
.It Fl T Ar dir , Fl Fl temporary-directory Ns = Ns Ar dir
|
||||
Store temporary files in the directory
|
||||
.Ar dir .
|
||||
The default path is the value of the environment variable
|
||||
.Ev TMPDIR
|
||||
or
|
||||
.Pa /var/tmp
|
||||
if
|
||||
.Ev TMPDIR
|
||||
is not defined.
|
||||
.It Fl u , Fl Fl unique
|
||||
Unique keys.
|
||||
Suppress all lines that have a key that is equal to an already
|
||||
processed one.
|
||||
This option, similarly to
|
||||
.Fl s ,
|
||||
implies a stable sort.
|
||||
If used with
|
||||
.Fl c
|
||||
or
|
||||
.Fl C ,
|
||||
.Nm
|
||||
also checks that there are no lines with duplicate keys.
|
||||
.It Fl s
|
||||
Stable sort.
|
||||
This option maintains the original record order of records that have
|
||||
and equal key.
|
||||
This is a non-standard feature, but it is widely accepted and used.
|
||||
.It Fl Fl version
|
||||
Print the version and silently exits.
|
||||
.It Fl Fl help
|
||||
Print the help text and silently exits.
|
||||
.El
|
||||
.Pp
|
||||
The following options override the default ordering rules.
|
||||
When ordering options appear independently of key field
|
||||
specifications, they apply globally to all sort keys.
|
||||
When attached to a specific key (see
|
||||
.Fl k ) ,
|
||||
the ordering options override all global ordering options for
|
||||
the key they are attahced to.
|
||||
.Bl -tag -width indent
|
||||
.It Fl b, Fl Fl ignore-leading-blanks
|
||||
Ignore leading blank characters when comparing lines.
|
||||
.It Fl d , Fl Fl dictionary-order
|
||||
Consider only blank spaces and alphanumeric characters in comparisons.
|
||||
.It Fl f , Fl Fl ignore-case
|
||||
Convert all lowercase characters to their uppercase equivalent
|
||||
before comparison, that is, perform case-independent sorting.
|
||||
.It Fl g, Fl Fl general-numeric-sort, Fl Fl sort=general-numeric
|
||||
Sort by general numerical value.
|
||||
As opposed to
|
||||
.Fl n ,
|
||||
this option handles general floating points, which have a much
|
||||
permissive format than those allowed by
|
||||
. Fl n ,
|
||||
but it has a significant performance drawback.
|
||||
.It Fl h, Fl Fl human-numeric-sort, Fl Fl sort=human-numeric
|
||||
Sort by numerical value, but take into account the SI suffix,
|
||||
if present.
|
||||
Sort first by numeric sign (negative, zero, or
|
||||
positive); then by SI suffix (either empty, or `k' or `K', or one
|
||||
of `MGTPEZY', in that order); and finally by numeric value.
|
||||
The SI suffix must immediately follow the number.
|
||||
For example, '12345K' sorts before '1M', because M is "larger" than K.
|
||||
This sort option is useful for sorting the output of a single invocation
|
||||
of 'df' command with
|
||||
.Fl h
|
||||
or
|
||||
.Fl H
|
||||
options (human-readable).
|
||||
.It Fl i , Fl Fl ignore-nonprinting
|
||||
Ignore all non-printable characters.
|
||||
.It Fl M, Fl Fl month-sort, Fl Fl sort=month
|
||||
Sort by month abbreviations.
|
||||
Unknown strings are considered smaller than the month names.
|
||||
.It Fl n , Fl Fl numeric-sort, Fl Fl sort=numeric
|
||||
Sort fields numerically by arithmetic value.
|
||||
Fields are supposed to have optional blanks in the beginning, an
|
||||
optional minus sign, zero or more digits (including decimal point and
|
||||
possible thousand separators).
|
||||
.It Fl R, Fl Fl random-sort, Fl Fl sort=random
|
||||
Sort by a random order.
|
||||
This is a random permutation of the inputs except that
|
||||
the equal keys sort together.
|
||||
It is implemented by hashing the input keys and sorting
|
||||
the hash values.
|
||||
The hash function is choosen randomly.
|
||||
The hash function is randomized by
|
||||
.Cm /dev/random
|
||||
content, or by file content if it is specified by
|
||||
.Fl Fl random-source .
|
||||
Even if multiple sort fields are specified,
|
||||
the same random hash function is used for all of them.
|
||||
.It Fl r , Fl Fl reverse
|
||||
Sort in reverse order.
|
||||
.It Fl V, Fl Fl version-sort
|
||||
Sort version numbers.
|
||||
The input lines are treated as file names in form
|
||||
PREFIX VERSION SUFFIX, where SUFFIX matches the regular expression
|
||||
"(\.([A-Za-z~][A-Za-z0-9~]*)?)*".
|
||||
The files are compared by their prefixes and versions (leading
|
||||
zeros are ignored in version numbers, see example below).
|
||||
If an input string does not match the pattern, then it is compared
|
||||
using the byte compare function.
|
||||
All string comparisions are performed in C locale, the locale
|
||||
environment setting is ignored.
|
||||
.Bl -tag -width indent
|
||||
.It Example:
|
||||
.It $ ls sort* | sort -V
|
||||
.It sort-1.022.tgz
|
||||
.It sort-1.23.tgz
|
||||
.It sort-1.23.1.tgz
|
||||
.It sort-1.024.tgz
|
||||
.It sort-1.024.003.
|
||||
.It sort-1.024.003.tgz
|
||||
.It sort-1.024.07.tgz
|
||||
.It sort-1.024.009.tgz
|
||||
.El
|
||||
.El
|
||||
.Pp
|
||||
The treatment of field separators can be altered using these options:
|
||||
.Bl -tag -width indent
|
||||
.It Fl b , Fl Fl ignore-leading-blanks
|
||||
Ignore leading blank space when determining the start
|
||||
and end of a restricted sort key (see
|
||||
.Fl k
|
||||
).
|
||||
If
|
||||
.Fl b
|
||||
is specified before the first
|
||||
.Fl k
|
||||
option, it applies globally to all key specifications.
|
||||
Otherwise,
|
||||
.Fl b
|
||||
can be attached independently to each
|
||||
.Ar field
|
||||
argument of the key specifications.
|
||||
.Fl b .
|
||||
.It Xo
|
||||
.Sm off
|
||||
.Fl k\ \& Ar field1 Op , Ar field2 , Fl Fl key Ns = Ns Ar field1 Op , Ar field2
|
||||
.Sm on
|
||||
.Xc
|
||||
Define a restricted sort key that has the starting position
|
||||
.Ar field1 ,
|
||||
and optional ending position
|
||||
.Ar field2
|
||||
of a key field.
|
||||
The
|
||||
.Fl k
|
||||
option may be specified multiple times,
|
||||
in which case subsequent keys are compared when earlier keys compare equal.
|
||||
The
|
||||
.Fl k
|
||||
option replaces the obsolete options
|
||||
.Cm \(pl Ns Ar pos1
|
||||
and
|
||||
.Fl Ns Ar pos2 ,
|
||||
but the old notation is also supported.
|
||||
.It Fl t Ar char , Fl Fl field-separator Ns = Ns Ar char
|
||||
Use
|
||||
.Ar char
|
||||
as a field separator character.
|
||||
The initial
|
||||
.Ar char
|
||||
is not considered to be part of a field when determining key offsets.
|
||||
Each occurrence of
|
||||
.Ar char
|
||||
is significant (for example,
|
||||
.Dq Ar charchar
|
||||
delimits an empty field).
|
||||
If
|
||||
.Fl t
|
||||
is not specified, the default field separator is a sequence of
|
||||
blank space characters, and consecutive blank spaces do
|
||||
.Em not
|
||||
delimit an empty field, however, the initial blank space
|
||||
.Em is
|
||||
considered part of a field when determining key offsets.
|
||||
To use NUL as field separator, use
|
||||
.Fl t
|
||||
\'\\0\'.
|
||||
.It Fl z , Fl Fl zero-terminated
|
||||
Use NUL as record separator.
|
||||
By default, records in the files are supposed to be separated by
|
||||
the newline characters.
|
||||
With this option, NUL (\'\\0\') is used as a record separator character.
|
||||
.El
|
||||
.Pp
|
||||
Other options:
|
||||
.Bl -tag -width indent
|
||||
.It Fl Fl batch-size Ns = Ns Ar num
|
||||
Specify maximum number of files that can be opened by
|
||||
.Nm
|
||||
at once.
|
||||
This option affects behavior when having many input files or using
|
||||
temporary files.
|
||||
The default value is 16.
|
||||
.It Fl Fl compress-program Ns = Ns Ar PROGRAM
|
||||
Use PROGRAM to compress temporary files.
|
||||
PROGRAM must compress standard input to standard output, when called
|
||||
without arguments.
|
||||
When called with argument
|
||||
.Fl d
|
||||
it must decompress standard input to standard output.
|
||||
If PROGRAM fails,
|
||||
.Nm
|
||||
must exit with error.
|
||||
An example of PROGRAM that can be used here is bzip2.
|
||||
.It Fl Fl random-source Ns = Ns Ar filename
|
||||
In random sort, the file content is used as the source of the 'seed' data
|
||||
for the hash function choice.
|
||||
Two invocations of random sort with the same seed data will use
|
||||
the same hash function and will produce the same result if the input is
|
||||
also identical.
|
||||
By default, file
|
||||
.Cm /dev/random
|
||||
is used.
|
||||
.It Fl Fl debug
|
||||
Print some extra information about the sorting process to the
|
||||
standard output.
|
||||
%%THREADS%%.It Fl Fl nthreads
|
||||
%%THREADS%%Set the maximum number of execution threads.
|
||||
%%THREADS%%Default number equals to the number of CPUs.
|
||||
.It Fl Fl files0-from Ns = Ns Ar filename
|
||||
Take the input file list from the file
|
||||
.Ar filename.
|
||||
The file names must be separated by NUL
|
||||
(like the output produced by the command "find ... -print0").
|
||||
.It Fl Fl radixsort
|
||||
Try to use radix sort, if the sort specifications allow.
|
||||
The radix sort can only be used for trivial locales (C and POSIX),
|
||||
and it cannot be used for numeric or month sort.
|
||||
Radix sort is very fast and stable.
|
||||
.It Fl Fl mergesort
|
||||
Use mergesort.
|
||||
This is a universal algorithm that can always be used,
|
||||
but it is not always the fastest.
|
||||
.It Fl Fl qsort
|
||||
Try to use quick sort, if the sort specifications allow.
|
||||
This sort algorithm cannot be used with
|
||||
.Fl u
|
||||
and
|
||||
.Fl s .
|
||||
.It Fl Fl heapsort
|
||||
Try to use heap sort, if the sort specifications allow.
|
||||
This sort algorithm cannot be used with
|
||||
.Fl u
|
||||
and
|
||||
.Fl s .
|
||||
.El
|
||||
.Pp
|
||||
The following operands are available:
|
||||
.Bl -tag -width indent
|
||||
.It Ar file
|
||||
The pathname of a file to be sorted, merged, or checked.
|
||||
If no
|
||||
.Ar file
|
||||
operands are specified, or if a
|
||||
.Ar file
|
||||
operand is
|
||||
.Fl ,
|
||||
the standard input is used.
|
||||
.El
|
||||
.Pp
|
||||
A field is defined as a maximal sequence of characters other than the
|
||||
field separator and record separator (newline by default).
|
||||
Initial blank spaces are included in the field unless
|
||||
.Fl b
|
||||
has been specified;
|
||||
the first blank space of a sequence of blank spaces acts as the field
|
||||
separator and is included in the field (unless
|
||||
.Fl t
|
||||
is specified).
|
||||
For example, all blank spaces at the beginning of a line are
|
||||
considered to be part of the first field.
|
||||
.Pp
|
||||
Fields are specified by the
|
||||
.Sm off
|
||||
.Fl k\ \& Ar field1 Op , Ar field2
|
||||
.Sm on
|
||||
command-line option.
|
||||
If
|
||||
.Ar field2
|
||||
is missing, the end of the key defaults to the end of the line.
|
||||
.Pp
|
||||
The arguments
|
||||
.Ar field1
|
||||
and
|
||||
.Ar field2
|
||||
have the form
|
||||
.Em m.n
|
||||
.Em (m,n > 0)
|
||||
and can be followed by one or more of the modifiers
|
||||
.Cm b , d , f , i ,
|
||||
.Cm n , g , M
|
||||
and
|
||||
.Cm r ,
|
||||
which correspond to the options discussed above.
|
||||
When
|
||||
.Cm b
|
||||
is specified it applies only to
|
||||
.Ar field1
|
||||
or
|
||||
.Ar field2
|
||||
where it is specified while the rest of the modifiers
|
||||
apply to the whole key field regardless if they are
|
||||
specified only with
|
||||
.Ar field1
|
||||
or
|
||||
.Ar field2
|
||||
or both.
|
||||
A
|
||||
.Ar field1
|
||||
position specified by
|
||||
.Em m.n
|
||||
is interpreted as the
|
||||
.Em n Ns th
|
||||
character from the beginning of the
|
||||
.Em m Ns th
|
||||
field.
|
||||
A missing
|
||||
.Em \&.n
|
||||
in
|
||||
.Ar field1
|
||||
means
|
||||
.Ql \&.1 ,
|
||||
indicating the first character of the
|
||||
.Em m Ns th
|
||||
field; if the
|
||||
.Fl b
|
||||
option is in effect,
|
||||
.Em n
|
||||
is counted from the first non-blank character in the
|
||||
.Em m Ns th
|
||||
field;
|
||||
.Em m Ns \&.1b
|
||||
refers to the first non-blank character in the
|
||||
.Em m Ns th
|
||||
field.
|
||||
.No 1\&. Ns Em n
|
||||
refers to the
|
||||
.Em n Ns th
|
||||
character from the beginning of the line;
|
||||
if
|
||||
.Em n
|
||||
is greater than the length of the line, the field is taken to be empty.
|
||||
.Pp
|
||||
.Em n Ns th
|
||||
positions are always counted from the field beginning, even if the field
|
||||
is shorter than the number of specified positions.
|
||||
Thus, the key can really start from a position in a subsequent field.
|
||||
.Pp
|
||||
A
|
||||
.Ar field2
|
||||
position specified by
|
||||
.Em m.n
|
||||
is interpreted as the
|
||||
.Em n Ns th
|
||||
character (including separators) from the beginning of the
|
||||
.Em m Ns th
|
||||
field.
|
||||
A missing
|
||||
.Em \&.n
|
||||
indicates the last character of the
|
||||
.Em m Ns th
|
||||
field;
|
||||
.Em m
|
||||
= \&0
|
||||
designates the end of a line.
|
||||
Thus the option
|
||||
.Fl k Ar v.x,w.y
|
||||
is synonymous with the obsolete option
|
||||
.Cm \(pl Ns Ar v-\&1.x-\&1
|
||||
.Fl Ns Ar w-\&1.y ;
|
||||
when
|
||||
.Em y
|
||||
is omitted,
|
||||
.Fl k Ar v.x,w
|
||||
is synonymous with
|
||||
.Cm \(pl Ns Ar v-\&1.x-\&1
|
||||
.Fl Ns Ar w\&.0 .
|
||||
The obsolete
|
||||
.Cm \(pl Ns Ar pos1
|
||||
.Fl Ns Ar pos2
|
||||
option is still supported, except for
|
||||
.Fl Ns Ar w\&.0b ,
|
||||
which has no
|
||||
.Fl k
|
||||
equivalent.
|
||||
.Sh EXIT STATUS
|
||||
The
|
||||
.Nm
|
||||
utility shall exit with one of the following values:
|
||||
.Pp
|
||||
.Bl -tag -width flag -compact
|
||||
.It 0
|
||||
Successfully sorted the input files or if used with
|
||||
.Fl c
|
||||
or
|
||||
.Fl C ,
|
||||
the input file already met the sorting criteria.
|
||||
.It 1
|
||||
On disorder (or non-uniqueness) with the
|
||||
.Fl c
|
||||
or
|
||||
.Fl C
|
||||
options.
|
||||
.It 2
|
||||
An error occurred.
|
||||
.El
|
||||
.Sh ENVIRONMENT
|
||||
.Bl -tag -width Fl
|
||||
.It Ev LC_COLLATE
|
||||
Locale settings to be used to determine the collation for
|
||||
sorting records.
|
||||
.It Ev LC_CTYPE
|
||||
Locale settings to be used to case conversion and classification
|
||||
of characters, that is, which characters are considered
|
||||
whitespaces, etc.
|
||||
.It Ev LC_MESSAGES
|
||||
Locale settings that determine the language of output messages
|
||||
that
|
||||
.Nm
|
||||
prints out.
|
||||
.It Ev LC_NUMERIC
|
||||
Locale settings that determine the number format used in numeric sort.
|
||||
.It Ev LC_TIME
|
||||
Locale settings that determine the month format used in month sort.
|
||||
.It Ev LC_ALL
|
||||
Locale settings that override all of the above locale settings.
|
||||
This environment variable can be used to set all these settings
|
||||
to the same value at once.
|
||||
.It Ev LANG
|
||||
Used as a last resort to determine different kinds of locale-specific
|
||||
behavior if neither the respective environment variable, nor
|
||||
.Ev LC_ALL
|
||||
are set.
|
||||
%%NLS%%.It Ev NLSPATH
|
||||
%%NLS%%Path to NLS catalogs.
|
||||
.It Ev TMPDIR
|
||||
Path to the directory in which temporary files will be stored.
|
||||
Note that
|
||||
.Ev TMPDIR
|
||||
may be overridden by the
|
||||
.Fl T
|
||||
option.
|
||||
.It Ev GNUSORT_NUMERIC_COMPATIBILITY
|
||||
If defined
|
||||
.Fl t
|
||||
will not override the locale numeric symbols, that is, thousand
|
||||
separators and decimal separators.
|
||||
By default, if we specify
|
||||
.Fl t
|
||||
with the same symbol as the thousand separator or decimal point,
|
||||
the symbol will be treated as the field separator.
|
||||
Older behavior was less definite; the symbol was treated as both field
|
||||
separator and numeric separator, simultaneously.
|
||||
This environment variable enables the old behavior.
|
||||
.El
|
||||
.Sh FILES
|
||||
.Bl -tag -width Pa -compact
|
||||
.It Pa /var/tmp/.bsdsort.PID.*
|
||||
Temporary files.
|
||||
.It Pa /dev/random
|
||||
Default seed file for the random sort.
|
||||
.El
|
||||
.Sh SEE ALSO
|
||||
.Xr comm 1 ,
|
||||
.Xr join 1 ,
|
||||
.Xr uniq 1 .
|
||||
.Sh STANDARDS
|
||||
The
|
||||
.Nm
|
||||
utility is compliant with the
|
||||
.St -p1003.1-2008
|
||||
specification.
|
||||
.Pp
|
||||
The flags
|
||||
.Op Fl ghRMSsTVz
|
||||
are extensions to the POSIX specification.
|
||||
.Pp
|
||||
All long options are extensions to the specification, some of them are
|
||||
provided for compatibility with GNU versions and some of them are
|
||||
own extensions.
|
||||
.Pp
|
||||
The old key notations
|
||||
.Cm \(pl Ns Ar pos1
|
||||
and
|
||||
.Fl Ns Ar pos2
|
||||
come from older versions of
|
||||
.Nm
|
||||
and are still supported but their use is highly discouraged.
|
||||
.Sh HISTORY
|
||||
A
|
||||
.Nm
|
||||
command first appeared in
|
||||
.At v3 .
|
||||
.Sh AUTHORS
|
||||
Gabor Kovesdan <gabor@FreeBSD.org>,
|
||||
.Pp
|
||||
Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
.Sh NOTES
|
||||
This implementation of
|
||||
.Nm
|
||||
has no limits on input line length (other than imposed by available
|
||||
memory) or any restrictions on bytes allowed within lines.
|
||||
.Pp
|
||||
The performance depends highly on locale settings,
|
||||
efficient choice of sort keys and key complexity.
|
||||
The fastest sort is with locale C, on whole lines,
|
||||
with option
|
||||
.Fl s.
|
||||
In general, locale C is the fastest, then single-byte
|
||||
locales follow and multi-byte locales as the slowest but
|
||||
the correct collation order is always respected.
|
||||
As for the key specification, the simpler to process the
|
||||
lines the faster the search will be.
|
||||
.Pp
|
||||
When sorting by arithmetic value, using
|
||||
.Fl n
|
||||
results in much better performance than
|
||||
.Fl g
|
||||
so its use is encouraged
|
||||
whenever possible.
|
1324
usr.bin/sort/sort.c
Normal file
1324
usr.bin/sort/sort.c
Normal file
File diff suppressed because it is too large
Load Diff
129
usr.bin/sort/sort.h
Normal file
129
usr.bin/sort/sort.h
Normal file
@ -0,0 +1,129 @@
|
||||
/* $FreeBSD$ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
|
||||
* Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if !defined(__BSD_SORT_H__)
|
||||
#define __BSD_SORT_H__
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <sysexits.h>
|
||||
#include <wchar.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <md5.h>
|
||||
|
||||
#define VERSION "2.3-FreeBSD"
|
||||
|
||||
#define UNUSED_ARG(A) do { A=A; } while(0)
|
||||
|
||||
#ifdef WITHOUT_NLS
|
||||
#define getstr(n) nlsstr[n]
|
||||
#else
|
||||
#include <nl_types.h>
|
||||
|
||||
extern nl_catd catalog;
|
||||
#define getstr(n) catgets(catalog, 1, n, nlsstr[n])
|
||||
#endif
|
||||
|
||||
extern const char *nlsstr[];
|
||||
|
||||
#if defined(SORT_THREADS)
|
||||
extern size_t ncpu;
|
||||
extern size_t nthreads;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* If true, we output some debug information.
|
||||
*/
|
||||
extern bool debug_sort;
|
||||
|
||||
/*
|
||||
* MD5 context for random hash function
|
||||
*/
|
||||
extern MD5_CTX md5_ctx;
|
||||
|
||||
/*
|
||||
* sort.c
|
||||
*/
|
||||
|
||||
/*
|
||||
* This structure holds main sort options which are NOT affecting the sort ordering.
|
||||
*/
|
||||
struct sort_opts
|
||||
{
|
||||
wchar_t field_sep;
|
||||
int sort_method;
|
||||
bool cflag;
|
||||
bool csilentflag;
|
||||
bool kflag;
|
||||
bool mflag;
|
||||
bool sflag;
|
||||
bool uflag;
|
||||
bool zflag;
|
||||
bool tflag;
|
||||
bool complex_sort;
|
||||
};
|
||||
|
||||
/*
|
||||
* Key value structure forward declaration
|
||||
*/
|
||||
struct key_value;
|
||||
|
||||
/*
|
||||
* Cmp function
|
||||
*/
|
||||
typedef int (*cmpcoll_t)(struct key_value *kv1, struct key_value *kv2, size_t offset);
|
||||
|
||||
/*
|
||||
* This structure holds "sort modifiers" - options which are affecting the sort ordering.
|
||||
*/
|
||||
struct sort_mods
|
||||
{
|
||||
cmpcoll_t func;
|
||||
bool bflag;
|
||||
bool dflag;
|
||||
bool fflag;
|
||||
bool gflag;
|
||||
bool iflag;
|
||||
bool Mflag;
|
||||
bool nflag;
|
||||
bool rflag;
|
||||
bool Rflag;
|
||||
bool Vflag;
|
||||
bool hflag;
|
||||
};
|
||||
|
||||
extern bool need_hint;
|
||||
|
||||
extern struct sort_opts sort_opts_vals;
|
||||
|
||||
extern struct sort_mods * const default_sort_mods;
|
||||
|
||||
#endif /* __BSD_SORT_H__ */
|
265
usr.bin/sort/vsort.c
Normal file
265
usr.bin/sort/vsort.c
Normal file
@ -0,0 +1,265 @@
|
||||
/*-
|
||||
* Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <ctype.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "sort.h"
|
||||
#include "vsort.h"
|
||||
|
||||
static inline bool
|
||||
isdigit_clocale(wchar_t c)
|
||||
{
|
||||
|
||||
return (c >= L'0' && c <= L'9');
|
||||
}
|
||||
|
||||
static inline bool
|
||||
isalpha_clocale(wchar_t c)
|
||||
{
|
||||
|
||||
return ((c >= L'a' && c <= L'z') || (c >= L'A' && c <= L'Z'));
|
||||
}
|
||||
|
||||
static inline bool
|
||||
isalnum_clocale(wchar_t c)
|
||||
{
|
||||
|
||||
return ((c >= L'a' && c <= L'z') || (c >= L'A' && c <= L'Z') ||
|
||||
(c >= L'0' && c <= L'9'));
|
||||
}
|
||||
|
||||
/*
|
||||
* Find string suffix of format: (\.[A-Za-z~][A-Za-z0-9~]*)*$
|
||||
* Set length of string before suffix.
|
||||
*/
|
||||
static void
|
||||
find_suffix(bwstring_iterator si, bwstring_iterator se, size_t *len)
|
||||
{
|
||||
wchar_t c;
|
||||
size_t clen;
|
||||
bool expect_alpha, sfx;
|
||||
|
||||
sfx = false;
|
||||
expect_alpha = false;
|
||||
*len = 0;
|
||||
clen = 0;
|
||||
|
||||
while ((si < se) && (c = bws_get_iter_value(si))) {
|
||||
if (expect_alpha) {
|
||||
expect_alpha = false;
|
||||
if (!isalpha_clocale(c) && (c != L'~'))
|
||||
sfx = false;
|
||||
} else if (c == L'.') {
|
||||
expect_alpha = true;
|
||||
if (!sfx) {
|
||||
sfx = true;
|
||||
*len = clen;
|
||||
}
|
||||
} else if (!isalnum_clocale(c) && (c != L'~'))
|
||||
sfx = false;
|
||||
|
||||
si = bws_iterator_inc(si, 1);
|
||||
++clen;
|
||||
}
|
||||
|
||||
/* This code must be here to make the implementation compatible
|
||||
* with WORDING of GNU sort documentation.
|
||||
* But the GNU sort implementation is not following its own
|
||||
* documentation. GNU sort allows empty file extensions
|
||||
* (just dot with nothing after); but the regular expression in
|
||||
* their documentation does not allow empty file extensions.
|
||||
* We chose to make our implementation compatible with GNU sort
|
||||
* implementation. If they will ever fix their bug, this code
|
||||
* must be uncommented. Or they may choose to fix the info page,
|
||||
* then the code stays commented.
|
||||
*
|
||||
if (expect_alpha)
|
||||
sfx = false;
|
||||
*/
|
||||
|
||||
if (!sfx)
|
||||
*len = clen;
|
||||
}
|
||||
|
||||
static inline int
|
||||
cmp_chars(wchar_t c1, wchar_t c2)
|
||||
{
|
||||
|
||||
if (c1 == c2)
|
||||
return (0);
|
||||
|
||||
if (c1 == L'~')
|
||||
return (-1);
|
||||
if (c2 == L'~')
|
||||
return (+1);
|
||||
|
||||
if (isdigit_clocale(c1) || !c1)
|
||||
return ((isdigit_clocale(c2) || !c2) ? 0 : -1);
|
||||
|
||||
if (isdigit_clocale(c2) || !c2)
|
||||
return (+1);
|
||||
|
||||
if (isalpha_clocale(c1))
|
||||
return ((isalpha_clocale(c2)) ? ((int) c1 - (int) c2) : -1);
|
||||
|
||||
if (isalpha_clocale(c2))
|
||||
return (+1);
|
||||
|
||||
return ((int) c1 - (int) c2);
|
||||
}
|
||||
|
||||
static int
|
||||
cmpversions(bwstring_iterator si1, bwstring_iterator se1,
|
||||
bwstring_iterator si2, bwstring_iterator se2)
|
||||
{
|
||||
int cmp, diff;
|
||||
|
||||
while ((si1 < se1) || (si2 < se2)) {
|
||||
diff = 0;
|
||||
|
||||
while (((si1 < se1) &&
|
||||
!isdigit_clocale(bws_get_iter_value(si1))) ||
|
||||
((si2 < se2) && !isdigit_clocale(bws_get_iter_value(si2)))) {
|
||||
wchar_t c1, c2;
|
||||
|
||||
c1 = (si1 < se1) ? bws_get_iter_value(si1) : 0;
|
||||
c2 = (si2 < se2) ? bws_get_iter_value(si2) : 0;
|
||||
|
||||
cmp = cmp_chars(c1, c2);
|
||||
if (cmp)
|
||||
return (cmp);
|
||||
|
||||
if (si1 < se1)
|
||||
si1 = bws_iterator_inc(si1, 1);
|
||||
if (si2 < se2)
|
||||
si2 = bws_iterator_inc(si2, 1);
|
||||
}
|
||||
|
||||
while (bws_get_iter_value(si1) == L'0')
|
||||
si1 = bws_iterator_inc(si1, 1);
|
||||
|
||||
while (bws_get_iter_value(si2) == L'0')
|
||||
si2 = bws_iterator_inc(si2, 1);
|
||||
|
||||
while (isdigit_clocale(bws_get_iter_value(si1)) &&
|
||||
isdigit_clocale(bws_get_iter_value(si2))) {
|
||||
if (!diff)
|
||||
diff = ((int)bws_get_iter_value(si1) -
|
||||
(int)bws_get_iter_value(si2));
|
||||
si1 = bws_iterator_inc(si1, 1);
|
||||
si2 = bws_iterator_inc(si2, 1);
|
||||
}
|
||||
|
||||
if (isdigit_clocale(bws_get_iter_value(si1)))
|
||||
return (1);
|
||||
|
||||
if (isdigit_clocale(bws_get_iter_value(si2)))
|
||||
return (-1);
|
||||
|
||||
if (diff)
|
||||
return (diff);
|
||||
}
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Compare two version strings
|
||||
*/
|
||||
int
|
||||
vcmp(struct bwstring *s1, struct bwstring *s2)
|
||||
{
|
||||
bwstring_iterator si1, si2;
|
||||
wchar_t c1, c2;
|
||||
size_t len1, len2, slen1, slen2;
|
||||
int cmp_bytes, cmp_res;
|
||||
|
||||
if (s1 == s2)
|
||||
return (0);
|
||||
|
||||
cmp_bytes = bwscmp(s1, s2, 0);
|
||||
if (cmp_bytes == 0)
|
||||
return (0);
|
||||
|
||||
len1 = slen1 = BWSLEN(s1);
|
||||
len2 = slen2 = BWSLEN(s2);
|
||||
|
||||
if (slen1 < 1)
|
||||
return (-1);
|
||||
if (slen2 < 1)
|
||||
return (+1);
|
||||
|
||||
si1 = bws_begin(s1);
|
||||
si2 = bws_begin(s2);
|
||||
|
||||
c1 = bws_get_iter_value(si1);
|
||||
c2 = bws_get_iter_value(si2);
|
||||
|
||||
if (c1 == L'.' && (slen1 == 1))
|
||||
return (-1);
|
||||
|
||||
if (c2 == L'.' && (slen2 == 1))
|
||||
return (+1);
|
||||
|
||||
if (slen1 == 2 && c1 == L'.' &&
|
||||
bws_get_iter_value(bws_iterator_inc(si1, 1)) == L'.')
|
||||
return (-1);
|
||||
if (slen2 == 2 && c2 == L'.' &&
|
||||
bws_get_iter_value(bws_iterator_inc(si2, 1)) == L'.')
|
||||
return (+1);
|
||||
|
||||
if (c1 == L'.' && c2 != L'.')
|
||||
return (-1);
|
||||
if (c1 != L'.' && c2 == L'.')
|
||||
return (+1);
|
||||
|
||||
if (c1 == L'.' && c2 == L'.') {
|
||||
si1 = bws_iterator_inc(si1, 1);
|
||||
si2 = bws_iterator_inc(si2, 1);
|
||||
}
|
||||
|
||||
find_suffix(si1, bws_end(s1), &len1);
|
||||
find_suffix(si2, bws_end(s2), &len2);
|
||||
|
||||
if ((len1 == len2) && (bws_iterator_cmp(si1, si2, len1) == 0))
|
||||
return (cmp_bytes);
|
||||
|
||||
cmp_res = cmpversions(si1, bws_iterator_inc(si1, len1), si2,
|
||||
bws_iterator_inc(si2, len2));
|
||||
|
||||
if (cmp_res == 0)
|
||||
cmp_res = cmp_bytes;
|
||||
|
||||
return (cmp_res);
|
||||
}
|
37
usr.bin/sort/vsort.h
Normal file
37
usr.bin/sort/vsort.h
Normal file
@ -0,0 +1,37 @@
|
||||
/* $FreeBSD$ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
|
||||
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if !defined(__VSORT_H__)
|
||||
#define _VSORT_H__
|
||||
|
||||
#include "bwstring.h"
|
||||
|
||||
int vcmp(struct bwstring *s1, struct bwstring *s2);
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user