Merge branch 'main' into man

Author: Wandalen

Cargo.lock

@@ -10,6 +10,7 @@ members = [
 	"file",
 	"fs",
 	"ftw",
+	"make",
 	"m4",
 	"m4/test-manager",
 	"gettext-rs",
@@ -19,6 +20,7 @@ members = [
 	"process",
 	"sccs",
 	"screen",
+	"sh",
 	"sys",
 	"text",
 	"tree",
@@ -31,6 +33,7 @@ members = [
 repository = "https://github.com/rustcoreutils/posixutils-rs"
 license = "MIT"
 edition = "2021"
+rust-version = "1.84.0"
 
 [workspace.dependencies]
 clap = { version = "4", default-features = false, features = ["std", "derive", "help", "usage", "error-context", "cargo"] }
@@ -39,6 +42,7 @@ libc = "0.2"
 regex = "1.10"
 gettext-rs = { path = "./gettext-rs" }
 errno = "0.3"
+chrono-tz = "0.10"
 
 [workspace.lints]
 

Cargo.toml

@@ -80,11 +80,14 @@ Because it is a FAQ, the major differences between this project and uutils are:
  - [x] gencat (i18n)
  - [x] grep
  - [x] head
+ - [x] iconv (i18n)
  - [x] join
  - [x] link
  - [x] ls
  - [x] m4
+ - [x] make
  - [x] mkdir
+ - [x] more
  - [x] mv
  - [x] nl
  - [x] nm (Development)
@@ -95,6 +98,8 @@ Because it is a FAQ, the major differences between this project and uutils are:
  - [x] realpath
  - [x] rm
  - [x] rmdir
+ - [x] sed
+ - [x] sh
  - [x] sort
  - [x] split
  - [x] strings
@@ -116,6 +121,7 @@ Because it is a FAQ, the major differences between this project and uutils are:
 
 ## Stage 2 - Feature-complete and POSIX compliant
 
+ - [x] batch (cron cat.)
  - [x] cat
  - [x] chgrp
  - [x] chmod
@@ -127,12 +133,14 @@ Because it is a FAQ, the major differences between this project and uutils are:
  - [x] logname
  - [x] mesg
  - [x] mkfifo
+ - [x] newgrp
  - [x] nice
  - [x] nohup
  - [x] pathchk
  - [x] pwd
  - [x] renice
  - [x] sleep
+ - [x] talk
  - [x] tee
  - [x] touch
  - [x] tty
@@ -166,7 +174,6 @@ Because it is a FAQ, the major differences between this project and uutils are:
 
 ### Cron category
  - [ ] at (cron cat.)
- - [ ] batch (cron cat.)
  - [ ] crontab (cron cat.)
 
 ### Development category
@@ -190,7 +197,6 @@ Because it is a FAQ, the major differences between this project and uutils are:
 
  ### i18n category
  - [ ] gettext (i18n)
- - [ ] iconv (i18n) (status: in progress)
  - [ ] locale (i18n)
  - [ ] localedef (i18n)
  - [ ] msgfmt (i18n)
@@ -210,15 +216,9 @@ Because it is a FAQ, the major differences between this project and uutils are:
 ### Misc. category
  - [ ] lp
  - [ ] mailx
- - [ ] make (status: in progress)
- - [ ] man (status: in progress)
- - [ ] more
- - [ ] newgrp
- - [ ] patch (status: in progress)
+ - [ ] man
+ - [ ] patch
  - [ ] pax
- - [ ] sed
- - [ ] sh -- Volunteer starting point at https://github.com/rustcoreutils/posixutils-rs/tree/shell
- - [ ] talk (status: in progress)
 
 ## Installation
 

README.md

@@ -18,7 +18,11 @@
 
 ## Other items
 
-The `find` test `find_mtime_test` is hardcoded to use a specific
+**find**: The `find` test `find_mtime_test` is hardcoded to use a specific
 date offset.  This was increased to 7000 days to temporarily avoid
 test failure.  The test should be improved.
 
+**make**: posixutils' standard is to _not_ use the src/ directory that
+is standard for Rust binaries.  Update `make` to remove the src/
+directory by moving files within the repo.
+

TODO.md

@@ -1,24 +1,26 @@
 [package]
 name = "posixutils-awk"
-version = "0.2.1"
+version = "0.2.2"
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
-plib = { path = "../plib" }
 gettext-rs.workspace = true
 clap.workspace = true
 libc.workspace = true
 pest = "2.7"
 pest_derive = "2.7"
-lazy_static = "1.4"
 lexical = { version = "6.1", features = ["format"] }
-rand = {version = "0.8", default-features = false, features = ["small_rng"] }
+rand = { version = "0.8", default-features = false, features = ["small_rng"] }
+
+[dev-dependencies]
+plib = { path = "../plib" }
 
 [lints]
 workspace = true
 
 [[bin]]
 name = "awk"
-path = "src/main.rs"
+path = "main.rs"