logo

oasis-root

Compiled tree of Oasis Linux based on own branch at <https://hacktivis.me/git/oasis/> git clone https://anongit.hacktivis.me/git/oasis-root.git
commit: c89509fa7d6b345676b724f8a0564272f4b2982f
parent b5e21b6d8d2263e54f05150b5bf58ae1b2072b59
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Fri, 13 Sep 2024 04:48:13 +0200

oasis fbad83bae8

Diffstat:

Mbin/head0
Mbin/paste0
Mbin/renice0
Mbin/strings0
Mshare/man/man1/chroot.12++
Mshare/man/man1/cut.125+++++++++++++++++++++----
Mshare/man/man1/head.19++++++---
Mshare/man/man1/install.12++
Mshare/man/man1/mv.12++
Mshare/man/man1/paste.1168++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
Mshare/man/man1/strings.19+++++++--
11 files changed, 176 insertions(+), 41 deletions(-)

diff --git a/bin/head b/bin/head Binary files differ. diff --git a/bin/paste b/bin/paste Binary files differ. diff --git a/bin/renice b/bin/renice Binary files differ. diff --git a/bin/strings b/bin/strings Binary files differ. diff --git a/share/man/man1/chroot.1 b/share/man/man1/chroot.1 @@ -48,5 +48,7 @@ was found but couldn't be invoked. .Ar command wasn't found. .El +.Sh STANDARDS +None known. .Sh AUTHORS .An Haelwenn (lanodan) Monnier Aq Mt contact+utils@hacktivis.me diff --git a/share/man/man1/cut.1 b/share/man/man1/cut.1 @@ -34,11 +34,28 @@ or character-delimited fields .Pp The .Ar list -argument is a comma-separated list of 1-based ranges, where for example -.Ql 1,2,3 -and +argument is a comma-separated list of 1-based ranges, where: +.Bl -tag -width _1_2_3_ +.It Ql n- +Selects from +.Ql n +to the end of line. +.It Ql n +Selects +.Ql n +.It Ql n-m +Selects from +.Ql n +to +.Ql m . +.It Ql -m +Selects from +start of the line to +.Ql m . +.It Ql 1,2,3 +is equivalent to .Ql 1-3 -are equivalents. +.El .Sh OPTIONS .Bl -tag -width _d_delim .It Fl b Ar list diff --git a/share/man/man1/head.1 b/share/man/man1/head.1 @@ -9,7 +9,7 @@ .Nd print first part of files .Sh SYNOPSIS .Nm -.Op Fl qv +.Op Fl qvz .Op Fl c Ar size | Fl n Ar num | Fl Ar num .Op Ar file... .Sh DESCRIPTION @@ -53,6 +53,8 @@ are given. .It Fl v Always print header, regardless of the number of given .Ar file . +.It Fl z +Use NULL as line delimiter, not newline. .El .Pp If no option is specified, @@ -78,9 +80,10 @@ IEEE Std 1003.1-2024 (“POSIX.1”) specification. .br The -.Fl q +.Fl q , +.Fl v , and -.Fl v +.Fl z options are extensions. The .Fl Ar num diff --git a/share/man/man1/install.1 b/share/man/man1/install.1 @@ -89,6 +89,8 @@ Which asserts a single .Ar source operand. .El +.Sh EXIT STATUS +.Ex -std .Sh STANDARDS None known. .Sh HISTORY diff --git a/share/man/man1/mv.1 b/share/man/man1/mv.1 @@ -78,6 +78,8 @@ Set the destination directory. .It Fl v Verbose, write which action has been done. .El +.Sh EXIT STATUS +.Ex -std .Sh STANDARDS .Nm should be compliant with the diff --git a/share/man/man1/paste.1 b/share/man/man1/paste.1 @@ -1,51 +1,155 @@ -.Dd 2015-10-08 +.\" Copyright (c) 1989, 1990, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" This code is derived from software contributed to Berkeley by +.\" Adam S. Moskowitz and 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. +.\" +.\" @(#)paste.1 8.1 (Berkeley) 6/6/93 +.\" +.Dd November 6, 2022 .Dt PASTE 1 -.Os sbase +.Os .Sh NAME .Nm paste -.Nd merge lines of files in parallel or sequentially +.Nd merge corresponding or subsequent lines of files .Sh SYNOPSIS .Nm .Op Fl s .Op Fl d Ar list -.Ar file ... +.Ar .Sh DESCRIPTION +The .Nm -reads single lines from each -.Ar file -and writes them into one line, replacing -.Sy \en -with -.Sy \et -except from the last -.Ar file . -This process is repeated until each -.Ar file -is starved, treating zero-reads as empty lines along the way. +utility concatenates the corresponding lines of the given input files, +replacing all but the last file's newline characters with a single tab +character, and writes the resulting lines to standard output. +If end-of-file is reached on an input file while other input files +still contain data, the file is treated as if it were an endless source +of empty lines. .Pp -If -.Ar file -is '-', -.Nm -interprets it as stdin. -.Sh OPTIONS -.Bl -tag -width Ds +The options are as follows: +.Bl -tag -width Fl .It Fl d Ar list -Replace -.Sy \en -with escaped characters from +Use one or more of the provided characters to replace the newline +characters instead of the default tab. +The characters in .Ar list -by cycling through it. +are used circularly, i.e., when +.Ar list +is exhausted the first character from +.Ar list +is reused. +This continues until a line from the last input file (in default operation) +or the last line in each file (using the +.Fl s +option) is displayed, at which +time +.Nm +begins selecting characters from the beginning of +.Ar list +again. +.Pp +The following special characters can also be used in list: +.Pp +.Bl -tag -width flag -compact +.It Li \en +newline character +.It Li \et +tab character +.It Li \e\e +backslash character +.It Li \e0 +Empty string (not a null character). +.El +.Pp +Any other character preceded by a backslash is equivalent to the +character itself. .It Fl s -Read each -.Ar file -sequentially instead of in parallel. +Concatenate all of the lines of each separate input file in command line +order. +The newline character of every line except the last line in each input +file is replaced with the tab character, unless otherwise specified by +the +.Fl d +option. .El +.Pp +If +.Sq Fl +is specified for one or more of the input files, the standard +input is used; standard input is read one line at a time, circularly, +for each instance of +.Sq Fl . +.Sh EXIT STATUS +.Ex -std +.Sh EXAMPLES +List the files in the current directory in three columns: +.Pp +.Dl "ls | paste - - -" +.Pp +Combine pairs of lines from a file into single lines: +.Pp +.Dl "paste -s -d '\et\en' myfile" +.Pp +Number the lines in a file, similar to +.Xr nl 1 : +.Pp +.Dl "sed = myfile | paste - -" +.Pp +Create a colon-separated list of directories named +.Pa bin , +suitable +for use in the +.Ev PATH +environment variable: +.Pp +.Dl "find / -name bin -type d | paste -s -d : -" .Sh SEE ALSO .Xr cut 1 .Sh STANDARDS -The .Nm -utility is compliant with the -.St -p1003.1-2013 +should be compliant with the +IEEE Std 1003.1-2024 (“POSIX.1”) specification. +.Sh HISTORY +A +.Nm +command first appeared in +.At III +and has been available since +.Bx 4.3 Reno . +.Sh AUTHORS +.An -nosplit +The original Bell Labs version was written by +.An Gottfried W. R. Luderer +and the +.Bx +version by +.An Adam S. Moskowitz +and +.An Marciano Pitargue . diff --git a/share/man/man1/strings.1 b/share/man/man1/strings.1 @@ -1,7 +1,7 @@ .\" utils-std: Collection of commonly available Unix tools .\" Copyright 2017 Haelwenn (lanodan) Monnier <contact+utils@hacktivis.me> .\" SPDX-License-Identifier: MPL-2.0 -.Dd 2023-08-11 +.Dd 2024-09-09 .Dt STRINGS 1 .Os .Sh NAME @@ -9,7 +9,7 @@ .Nd find printable strings .Sh SYNOPSIS .Nm -.Op Fl a +.Op Fl az .Op Fl t Ar format .Op Fl n Ar number .Op Ar file... @@ -46,6 +46,8 @@ Octal .It x Hexadecimal .El +.It Fl z +Separate each string with NULL instead of newline. .El .Sh EXIT STATUS .Ex -std @@ -57,5 +59,8 @@ Hexadecimal should be compliant with the IEEE Std 1003.1-2024 (“POSIX.1”) specification. +The +.Fl z +option is an extension. .Sh AUTHORS .An Haelwenn (lanodan) Monnier Aq Mt contact+utils@hacktivis.me