src/usr.bin/sort, branch release/13.2.0 FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=release%2F13.2.0 2022-10-19T07:59:31Z sort: deindent file_reader_free and cleanup its usage 2022-10-19T07:59:31Z Baptiste Daroussin bapt@FreeBSD.org 2022-10-13T08:51:17Z urn:sha1:b4572fe565737c978f64516c7c355f160bda9d15 (cherry picked from commit 226e41467ee15c7aba33d59ee7b512b984b182e7) sort: simplify file_reader_clean 2022-10-19T07:59:31Z Baptiste Daroussin bapt@FreeBSD.org 2022-10-13T08:40:21Z urn:sha1:1cdb98e725586384105f73d13d58a8706b6e01f8 Deindent the function, remove useless tests: - free already test if argument is NULL - closefile already test if the input is stdin or null (cherry picked from commit ffd41d39c660ca1c80b77707238e8e5ef26d7d7a) sort: deindent closefile 2022-10-19T07:59:30Z Baptiste Daroussin bapt@FreeBSD.org 2022-10-13T08:38:12Z urn:sha1:0821423134b54ea490882640e956a65e29cf124e (cherry picked from commit f9d9a7cc4f2ff38795e5056721297e2b8442bf7a) sort: use asprintf(3) instead of malloc + snprintf(3) 2022-10-19T07:59:30Z Baptiste Daroussin bapt@FreeBSD.org 2022-10-13T08:34:57Z urn:sha1:67ca992f5ce64ffaeaabf969379579a0b774c5de (cherry picked from commit 48a53cc4849555f1a0b805adddb9f517a305a2ae) sort: deindent openfile 2022-10-19T07:59:30Z Baptiste Daroussin bapt@FreeBSD.org 2022-10-13T08:31:08Z urn:sha1:e3231f459f54e733d4ea86463b71de4c78e7e199 (cherry picked from commit 958b0d46425395f8f4606ac5d12681d623282e9d) sort: use memset to initialize structure when possible 2022-10-19T07:59:29Z Baptiste Daroussin bapt@FreeBSD.org 2022-10-13T07:07:46Z urn:sha1:e891183e60cee62a05d58b173fabd7876d522008 (cherry picked from commit f02c783757365340763739e58ef0e68ec13a0f8f) sort: unify the code to read from FILE * 2022-10-19T07:59:29Z Baptiste Daroussin bapt@FreeBSD.org 2022-10-13T07:36:48Z urn:sha1:2afc73005cb2c288a2445af6be10484e14ea7409 Previously the code to read from a local file or stdin was sperarated After the change to remove the home made line reader used for stdin (replaced by getdelim) it apprears that the rest of the code which is used to read from any FILE * but stdin can benefit from the exact same change. (cherry picked from commit 8b9071360a312f2bb2104864af0b9905acac87bc) sort: remove unused function 2022-10-19T07:59:29Z Baptiste Daroussin bapt@FreeBSD.org 2022-10-13T07:33:12Z urn:sha1:d068b2c1ead2acab0d9fd93ee0cf7dd4d8366389 (cherry picked from commit e8815fb30b340108bc4b36ab46afa31f673948d0) sort: simplify the code to handle -z flag 2022-10-19T07:59:29Z Baptiste Daroussin bapt@FreeBSD.org 2022-10-13T08:21:48Z urn:sha1:cacedfd1dfef096322e6f9d4473bca8066db994f (cherry picked from commit f079ef8aa428ebffad28f5c62cce52c2bf70fb49) sort: cleanup now unused structutre and prototypes 2022-10-19T07:59:28Z Baptiste Daroussin bapt@FreeBSD.org 2022-10-13T08:19:18Z urn:sha1:713ef741b77d4a61019fbb900db2b190fed77ccb (cherry picked from commit 4d4fcf619efcc02a962d0723a7ccd94fb621c6e6)