d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
200,956 Commits 4 Branches 49 Tags 2 GiB
27241dd28b
Commit Graph

57 Commits

Author SHA1 Message Date
garga
ae09e2fca2 Replace LDFLAGS by LDADD to fix sort build with -DNO_SHARED 
Differential Revision:	https://reviews.freebsd.org/D2044
Reviewed by:	sbruno@
Approved by:	sbruno@
Sponsored by:	Netgate
 2015-04-21 15:47:00 +00:00
pfg
f3aa91c084 MFC r281181, r281182; 
sort(1): Cleanups and a small memory leak.
Remove custom getdelim(3) and fix a small memory leak.

Obtained from:  OpenBSD
 2015-04-14 18:57:50 +00:00
bapt
2014ab0354 MFC: r272398 
Make sure to not skip any argument when converting from deprecated
+POS1, -POS2 to -kPOS1,POS2, so that sort +0n gets translated to sort -k1,1n
as it is expected

PR:		193994
Submitted by:	rodrigo
MFC after:	3 days
 2014-10-06 09:15:09 +00:00
gjb
1cf6163349 MFC r269289, r269290, r269291, r269292, r269293: 
r269289:
  sort(1): Remove trailing '.' from See Also section.

r269290:
  acpi_wmi(4): Remove trailing comma from standalone Xref.

r269291:
  hptiop(4): Remove trailing comma from ending Xref.

r269292:
  pf.conf(5): Remove trailing comma from ending Xref.

r269293:
  kernel_mount(9): Remove trailing comma from ending Xref.

Sponsored by:	The FreeBSD Foundation
 2014-08-04 03:59:48 +00:00
bdrewery
8cf68bdc10 MFC r264918: 
Fix spelling error.
 2014-05-14 15:24:25 +00:00
pfg
2372623c9c MFC r264581, r264744: 
Various style(9) fixes and typos in printf, grep, sort and patch.

#define should be followed by a tab.
 2014-04-30 20:39:08 +00:00
dim
6978c9a485 MFC r259740: 
In usr.bin/sort/radixsort.c, pop_ls_mt() is only referenced if
SORT_THREADS is defined, so make the whole function conditional, instead
of just the pthread calls in it.
 2013-12-25 00:53:48 +00:00
eadler
8436d05fdc Fix header guards. 
This was ready about the same time as r251862 so just make one final cleanup

Submitted by:	dt71@gmx.com
 2013-06-17 20:15:39 +00:00
pluknet
39742cda03 Clean up -Wheader-guard warnings. 
Submitted by:	<dt71@gmx.com>
MFC after:	3 days
X-MFC with:	r251848
 2013-06-17 20:11:04 +00:00
gabor
f4ae49737b - Update Oleg Moskalenko's email address 
Requested by:	Oleg Moskalenko <mom040267@gmail.com>
 2013-06-02 09:43:48 +00:00
gabor
ae62cf640b - Remove forgotten commented out debug code 
Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>
Reviewed by:	Oleg Moskalenko <oleg.moskalenko@citrix.com>
 2013-01-27 19:50:24 +00:00
gabor
2134c401b2 - Simplify and unify diagnostic and error message handling 
Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>
Reviewed by:	Oleg Moskalenko <oleg.moskalenko@citrix.com>
 2013-01-27 19:49:10 +00:00
gabor
974c3f6e17 - Change the memory heuristics to an actually working one 
Submitted by:	Oleg Moskalenko <oleg.moskalenko@citrix.com>
Prodded by:	kib
 2012-12-20 22:30:40 +00:00
gabor
85e6a53569 - Use unsigned int for values obtained with sysctlbyname(). This fixes 
sparc64 performance problems.

Submitted by:	Oleg Moskalenko <oleg.moskalenko@citrix.com>
Tested by:	trasz
 2012-12-17 09:36:43 +00:00
gabor
40317d46a3 - Portability changes for ARM 
- Allow larger sort memory on 64-bit platforms

Submitted by:	Oleg Moskalenko <oleg.moskalenko@citrix.com>
 2012-11-01 11:38:34 +00:00
ed
af31e8843c More -Wmissing-variable-declarations fixes. 
In addition to adding `static' where possible:

- bin/date: Move `retval' into extern.h to make it visible to date.c.
- bin/ed: Move globally used variables into ed.h.
- sbin/camcontrol: Move `verbose' into camcontrol.h and fix shadow warnings.
- usr.bin/calendar: Remove unneeded variables.
- usr.bin/chat: Make `line' local instead of global.
- usr.bin/elfdump: Comment out unneeded function.
- usr.bin/rlogin: Use _Noreturn instead of __dead2.
- usr.bin/tset: Pull `Ospeed' into extern.h.
- usr.sbin/mfiutil: Put global variables in mfiutil.h.
- usr.sbin/pkg: Remove unused `os_corres'.
- usr.sbin/quotaon, usr.sbin/repquota: Remove unused `qfname'.
 2012-10-19 14:49:42 +00:00
ed
0979ea8f97 Remove WARNS=6 lines. 
WARNS=6 is already implied at this point.
 2012-10-18 15:39:29 +00:00
gabor
7595cc54ef - Remove GNU sort and the WITH_GNU_SORT knob 2012-10-13 18:40:39 +00:00
joel
2a33599cdd Remove trailing whitespace. 2012-09-09 06:54:42 +00:00
gabor
58344b5c4d - Change --nthreads parameter to --parallel for GNU compatibility 
- Change default sort method to mergesort, which has a better worst case
  performance than qsort

Submitted by:	Oleg Moskalenko <oleg.moskalenko@citrix.com>
 2012-07-04 16:25:11 +00:00
gabor
c7fbb67362 - Switch to BSD sort as default sort. GNU sort will still be installed as 
"gnusort".  Most of the BSD sort development work was done by
  Oleg Moskalenko <oleg.moskalenko@citrix.com>.
- GNU grep can be set to default by setting WITH_GNU_GREP.  It will cause
  BSD sort to be installed as "bsdsort".

Portbuild tested by:    linimon
 2012-06-27 05:59:01 +00:00
gabor
dd4780f8e2 - Disable threaded sort by default 
- Fix typo in the NLS support
 2012-06-27 05:50:15 +00:00
gabor
671916033f - Remove the UNUSED_ARG macro and use __unused in argument lists 
Reviewed by:	dim
MFC after:	3 days
 2012-06-08 19:21:49 +00:00
dim
a3a73ec277 In usr.bin/sort, use another method of silencing warnings about unused 
arguments, which does not trigger self-assignment warnings in certain
circumstances (for example, using clang with ccache).

MFC after:	3 days
 2012-06-08 17:08:27 +00:00
joel
4f1c4001e8 mdoc: sort sections into conventional order. 2012-05-26 06:31:54 +00:00
gabor
02feec4a45 - Only use multi-threading for large files 
- Do not use mmap() by default; it can be enabled by --mmap
- Add some minor optimizations for -u
- Update manual page according to the changes

Submitted by:	Oleg Moskalenko <oleg.moskalenko@citrix.com>
 2012-05-25 09:30:16 +00:00
gabor
57fe23061a - Fix -o option that was broken by my clang compile fix 
Submitted by:	Oleg Moskalenko <oleg.moskalenko@citrix.com>
 2012-05-17 13:08:30 +00:00
gabor
1b903beae4 - Eliminate initializations if global variables. Compilers are not 
required to optimize these so it may result in larger binary size.

Pointed out by:	kib
 2012-05-14 10:06:49 +00:00
gabor
9b268b4b63 - Update catalogs 2012-05-14 09:55:23 +00:00
gabor
9903557495 - Fix build with clang 2012-05-14 09:53:54 +00:00
gabor
3c7b03ea74 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.
 2012-05-11 12:37:16 +00:00
ache
2f15166855 Remove it in favour of GNU sort 2002-04-08 20:50:12 +00:00
obrien
f892ac2191 Use the new features of cdefs.h. 2002-04-06 21:09:31 +00:00
obrien
3836772d94 Fix style. 2002-04-06 21:03:33 +00:00
ache
5c5bed840d Remove old sort files to _actually_ build it from contrib sources 
Forgotten by: des
 2002-04-06 20:22:06 +00:00
des
72f2fe98d8 Build a working version of sort(1) from contrib. Use netbsd.h as a hack 
to avoid bringing the sources off the vendor branch just to #ifdef out
the RCS and SCCS IDs.
 2002-04-06 13:59:43 +00:00
ache
a362222cc8 style(9) cosmetique of my changes 2002-04-06 00:40:19 +00:00
ache
ef609115a5 Add note about double-character letters like "ss" into BUGS section 
Reviewed by:	Mike DeGraw-Bertsch <mbertsch@radioactivedata.org>
 2002-04-05 19:29:05 +00:00
ache
a60be51cd4 Cast ctype macros char arg to u_char to prevent sign extension 2002-04-04 21:55:44 +00:00
ache
4ca17c54a3 For -n use decimal point from locale 2002-04-04 20:54:44 +00:00
ache
0a47b7b0f9 Remove __P 2002-04-04 19:18:58 +00:00
ache
fd5013bba2 Implement collating sort 2002-04-04 14:10:02 +00:00
ache
2864e7f3a4 Fix to handle REC_D > 127 and fold case sorting of high letters 
(linear sorting still assumed, no collating support yet).
 2002-04-03 01:39:26 +00:00
ache
0d49eb04ea Uncomment now implemented part of -d description 2002-03-31 20:18:35 +00:00
ache
0350a837b5 Remove \n from __COPYRIGHT to shut assembler warning 2002-03-31 20:11:10 +00:00
ache
0701204aaa Remove double SINGL_FLD and SEP_FLAG initialization 2002-03-27 22:41:01 +00:00
ache
693963da0d Fix the case when high letters becomes missing from fold tables 
for some locales
 2002-03-25 16:06:12 +00:00
ache
e87761a7cf Fix the case when record separator is 'Z' letter 
Sense high spaces for -d option too
 2002-03-25 15:49:07 +00:00
ache
9354df3c22 Remove double REC_D assignment 
Cast REC_D optarg assignment to (u_char) to prevent out of bounds indexing
 2002-03-25 14:22:31 +00:00
markm
5fb54802b6 Make this compile on FreeBSD. Sort out VCS tags, fix warnings. 2002-03-24 15:59:17 +00:00