Skip to content

Commit c44b295

Browse files
committed
Merge branch 'main' into man
2 parents db0cbda + 8e05a66 commit c44b295

File tree

616 files changed

+49919
-5098
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

616 files changed

+49919
-5098
lines changed

Cargo.lock

Lines changed: 638 additions & 292 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ members = [
1010
"file",
1111
"fs",
1212
"ftw",
13+
"make",
1314
"m4",
1415
"m4/test-manager",
1516
"gettext-rs",
@@ -19,6 +20,7 @@ members = [
1920
"process",
2021
"sccs",
2122
"screen",
23+
"sh",
2224
"sys",
2325
"text",
2426
"tree",
@@ -31,6 +33,7 @@ members = [
3133
repository = "https://github.com/rustcoreutils/posixutils-rs"
3234
license = "MIT"
3335
edition = "2021"
36+
rust-version = "1.84.0"
3437

3538
[workspace.dependencies]
3639
clap = { version = "4", default-features = false, features = ["std", "derive", "help", "usage", "error-context", "cargo"] }
@@ -39,6 +42,7 @@ libc = "0.2"
3942
regex = "1.10"
4043
gettext-rs = { path = "./gettext-rs" }
4144
errno = "0.3"
45+
chrono-tz = "0.10"
4246

4347
[workspace.lints]
4448

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,14 @@ Because it is a FAQ, the major differences between this project and uutils are:
8080
- [x] gencat (i18n)
8181
- [x] grep
8282
- [x] head
83+
- [x] iconv (i18n)
8384
- [x] join
8485
- [x] link
8586
- [x] ls
8687
- [x] m4
88+
- [x] make
8789
- [x] mkdir
90+
- [x] more
8891
- [x] mv
8992
- [x] nl
9093
- [x] nm (Development)
@@ -95,6 +98,8 @@ Because it is a FAQ, the major differences between this project and uutils are:
9598
- [x] realpath
9699
- [x] rm
97100
- [x] rmdir
101+
- [x] sed
102+
- [x] sh
98103
- [x] sort
99104
- [x] split
100105
- [x] strings
@@ -116,6 +121,7 @@ Because it is a FAQ, the major differences between this project and uutils are:
116121

117122
## Stage 2 - Feature-complete and POSIX compliant
118123

124+
- [x] batch (cron cat.)
119125
- [x] cat
120126
- [x] chgrp
121127
- [x] chmod
@@ -127,12 +133,14 @@ Because it is a FAQ, the major differences between this project and uutils are:
127133
- [x] logname
128134
- [x] mesg
129135
- [x] mkfifo
136+
- [x] newgrp
130137
- [x] nice
131138
- [x] nohup
132139
- [x] pathchk
133140
- [x] pwd
134141
- [x] renice
135142
- [x] sleep
143+
- [x] talk
136144
- [x] tee
137145
- [x] touch
138146
- [x] tty
@@ -166,7 +174,6 @@ Because it is a FAQ, the major differences between this project and uutils are:
166174

167175
### Cron category
168176
- [ ] at (cron cat.)
169-
- [ ] batch (cron cat.)
170177
- [ ] crontab (cron cat.)
171178

172179
### Development category
@@ -190,7 +197,6 @@ Because it is a FAQ, the major differences between this project and uutils are:
190197

191198
### i18n category
192199
- [ ] gettext (i18n)
193-
- [ ] iconv (i18n) (status: in progress)
194200
- [ ] locale (i18n)
195201
- [ ] localedef (i18n)
196202
- [ ] msgfmt (i18n)
@@ -210,15 +216,9 @@ Because it is a FAQ, the major differences between this project and uutils are:
210216
### Misc. category
211217
- [ ] lp
212218
- [ ] mailx
213-
- [ ] make (status: in progress)
214-
- [ ] man (status: in progress)
215-
- [ ] more
216-
- [ ] newgrp
217-
- [ ] patch (status: in progress)
219+
- [ ] man
220+
- [ ] patch
218221
- [ ] pax
219-
- [ ] sed
220-
- [ ] sh -- Volunteer starting point at https://github.com/rustcoreutils/posixutils-rs/tree/shell
221-
- [ ] talk (status: in progress)
222222

223223
## Installation
224224

TODO.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818

1919
## Other items
2020

21-
The `find` test `find_mtime_test` is hardcoded to use a specific
21+
**find**: The `find` test `find_mtime_test` is hardcoded to use a specific
2222
date offset. This was increased to 7000 days to temporarily avoid
2323
test failure. The test should be improved.
2424

25+
**make**: posixutils' standard is to _not_ use the src/ directory that
26+
is standard for Rust binaries. Update `make` to remove the src/
27+
directory by moving files within the repo.
28+

awk/Cargo.toml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
[package]
22
name = "posixutils-awk"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
repository.workspace = true
55
license.workspace = true
66
edition.workspace = true
7+
rust-version.workspace = true
78

89
[dependencies]
9-
plib = { path = "../plib" }
1010
gettext-rs.workspace = true
1111
clap.workspace = true
1212
libc.workspace = true
1313
pest = "2.7"
1414
pest_derive = "2.7"
15-
lazy_static = "1.4"
1615
lexical = { version = "6.1", features = ["format"] }
17-
rand = {version = "0.8", default-features = false, features = ["small_rng"] }
16+
rand = { version = "0.8", default-features = false, features = ["small_rng"] }
17+
18+
[dev-dependencies]
19+
plib = { path = "../plib" }
1820

1921
[lints]
2022
workspace = true
2123

2224
[[bin]]
2325
name = "awk"
24-
path = "src/main.rs"
26+
path = "main.rs"

0 commit comments

Comments
 (0)