Further work ...

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    labels:
+      - "improvement"
+    assignees:
+      - "cehteh"
+

.github/workflows/rust.yml

@@ -0,0 +1,24 @@
+name: Rust
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose
+    - name: Clippy
+      run: cargo clippy --verbose

.gitignore

@@ -2,3 +2,4 @@
 Cargo.lock
 /target
 /tmp
+.tests-*

Cargo.toml

@@ -1,22 +1,42 @@
 [package]
-name = "openat"
+name = "openat_ct"
 description = """
     A wrapper around openat, symlinkat, and similar system calls
+    forked and improved from https://crates.io/crates/openat
 """
 license = "MIT/Apache-2.0"
 readme = "README.md"
 keywords = ["open", "openat", "filesystem", "fs"]
 categories = ["filesystem", "api-bindings"]
-repository = "https://github.com/tailhook/openat"
-homepage = "https://github.com/tailhook/openat"
-documentation = "http://docs.rs/openat"
-version = "0.1.21"
-authors = ["[email protected]"]
-edition = "2018"
+repository = "https://github.com/cehteh/openat"
+homepage = "https://github.com/cehteh/openat"
+documentation = "http://docs.rs/openat_ct"
+version = "0.2.0-pre10"
+authors = ["[email protected], [email protected]"]
+edition = "2021"
+
+[features]
+default = []
+linux = ["o_path", "o_directory", "o_tmpfile", "statx", "proc_self_fd", "link_file_at", "rename_exchange", "renameat_flags", "fcntl_f_dupfd_cloexec"]
+#NOTE(cehteh): eventually provide some baseline configs for other OS'es (for cross compilation)
+o_path = []
+o_directory = []
+o_tmpfile = []
+o_search = []
+fcntl_o_directory = []
+fcntl_f_dupfd_cloexec = []
+proc_self_fd = []
+link_file_at = []
+renameat_flags = []
+rename_exchange = []
+statx = []
 
 [dependencies]
-libc = "0.2.34"
+libc = "0.2"
+
+[build-dependencies]
+conf_test = "0.3.0"
 
 [dev-dependencies]
-argparse = "0.2.1"
-tempfile = "3.0.3"
+argparse = "0.2"
+tempfile = "3.0"

README.md

@@ -1,16 +1,30 @@
-Openat Crate
-============
+Openat (ct) Crate
+=================
 
 **Status: Beta**
 
-[Documentation](https://docs.rs/openat) |
-[Github](https://github.com/tailhook/openat) |
-[Crate](https://crates.io/crates/openat)
+[Documentation](https://docs.rs/openat_ct) |
+[Github](https://github.com/cehteh/openat) |
+[Crate](https://crates.io/crates/openat_ct)
 
 
 The interface to ``openat``, ``symlinkat``, and other functions in ``*at``
 family.
 
+About this Fork
+===============
+
+This is a fork of the original 'openat' at https://github.com/tailhook/openat
+
+The objective is to fix existing Issues and add features as required. An eventual goal would
+be to get this merged back into upstream. In most cases the API should stay backward
+compatible with the original openat (Unless functionality and fixes dictate changes).
+
+It can be used as drop in replacement by aliasing the import:
+
+    use openat_ct as openat;
+
+
 Dependent crates
 ================
 

benches/count_processes.rs

@@ -3,37 +3,51 @@
 extern crate openat;
 extern crate test;
 
-
 use std::fs::read_dir;
-use std::str::from_utf8;
 use std::os::unix::ffi::OsStrExt;
-use test::Bencher;
+use std::str::from_utf8;
 
+use test::Bencher;
 use openat::Dir;
 
-
 #[bench]
 fn procs_stdlib(b: &mut Bencher) {
     b.iter(|| {
-        read_dir("/proc").unwrap().filter(|r| {
-            r.as_ref().ok()
-            .and_then(|e| from_utf8(e.file_name().as_bytes()).ok()
-            // pid is everything that can be parsed as a number
-                .and_then(|s| s.parse::<u32>().ok()))
-            .is_some()
-        }).count()
+        read_dir("/proc")
+            .unwrap()
+            .filter(|r| {
+                r.as_ref()
+                    .ok()
+                    .and_then(|e| {
+                        from_utf8(e.file_name().as_bytes())
+                            .ok()
+                            // pid is everything that can be parsed as a number
+                            .and_then(|s| s.parse::<u32>().ok())
+                    })
+                    .is_some()
+            })
+            .count()
     });
 }
 
 #[bench]
 fn procs_openat(b: &mut Bencher) {
     b.iter(|| {
-        Dir::open("/proc").unwrap().list_dir(".").unwrap().filter(|r| {
-            r.as_ref().ok()
-            .and_then(|e| from_utf8(e.file_name().as_bytes()).ok()
-            // pid is everything that can be parsed as a number
-                .and_then(|s| s.parse::<u32>().ok()))
-            .is_some()
-        }).count()
+        Dir::open("/proc")
+            .unwrap()
+            .list_dir(".")
+            .unwrap()
+            .filter(|r| {
+                r.as_ref()
+                    .ok()
+                    .and_then(|e| {
+                        from_utf8(e.file_name().as_bytes())
+                            .ok()
+                            // pid is everything that can be parsed as a number
+                            .and_then(|s| s.parse::<u32>().ok())
+                    })
+                    .is_some()
+            })
+            .count()
     });
 }

build.rs

@@ -0,0 +1,5 @@
+use conf_test::ConfTest;
+
+fn main() {
+    ConfTest::run();
+}

conf_tests/fcntl_f_dupfd_cloexec.rs

@@ -0,0 +1,10 @@
+extern crate libc;
+
+fn main() {
+    unsafe {
+        let conf_tests = std::ffi::CString::new("conf_tests").unwrap();
+        let fd = libc::open(conf_tests.as_ptr(), libc::O_DIRECTORY | libc::O_RDONLY);
+
+        let dup = libc::fcntl(fd, libc::F_DUPFD_CLOEXEC, 0);
+    }
+}

conf_tests/fcntl_o_directory.rs

@@ -0,0 +1,16 @@
+extern crate libc;
+
+fn main() {
+    unsafe {
+        let conf_tests = std::ffi::CString::new("conf_tests").unwrap();
+        let fd = libc::open(conf_tests.as_ptr(), libc::O_DIRECTORY | libc::O_RDONLY);
+
+        let flags = libc::fcntl(fd, libc::F_GETFL);
+
+        if flags != -1 && flags & libc::O_DIRECTORY != 0 {
+            std::process::exit(0);
+        } else {
+            std::process::exit(1);
+        }
+    }
+}

conf_tests/link_file_at.rs

@@ -0,0 +1,13 @@
+extern crate libc;
+
+fn main() {
+    //NOTE(cehteh): same as the proc_self_fd test, maybe we need something smarter in future
+    unsafe {
+        let conf_tests = std::ffi::CString::new("/proc/self/fd/0").unwrap();
+        if libc::open(conf_tests.as_ptr(), libc::O_RDONLY) != -1 {
+            std::process::exit(0);
+        } else {
+            std::process::exit(1);
+        }
+    }
+}

conf_tests/o_directory.rs

@@ -0,0 +1,8 @@
+extern crate libc;
+
+fn main() {
+    unsafe {
+        let conf_tests = std::ffi::CString::new("conf_tests").unwrap();
+  	libc::open(conf_tests.as_ptr(), libc::O_DIRECTORY);
+    }
+}

conf_tests/o_path.rs

@@ -0,0 +1,8 @@
+extern crate libc;
+
+fn main () {
+    unsafe {
+        let conf_tests = std::ffi::CString::new("conf_tests").unwrap();
+        libc::open(conf_tests.as_ptr(), libc::O_PATH);
+    }
+}

conf_tests/o_search.rs

@@ -0,0 +1,8 @@
+extern crate libc;
+
+fn main() {
+    unsafe {
+        let conf_tests = std::ffi::CString::new("conf_tests").unwrap();
+        libc::open(conf_tests.as_ptr(), libc::O_SEARCH);
+    }
+}

conf_tests/o_tmpfile.rs

@@ -0,0 +1,10 @@
+extern crate libc;
+
+fn main () {
+    unsafe {
+        let conf_tests = std::ffi::CString::new("conf_tests").unwrap();
+        libc::open(conf_tests.as_ptr(),
+                   libc::O_TMPFILE | libc::O_RDWR,
+                   libc::S_IRUSR | libc::S_IWUSR);
+    }
+}

conf_tests/proc_self_fd.rs

@@ -0,0 +1,12 @@
+extern crate libc;
+
+fn main() {
+    unsafe {
+        let conf_tests = std::ffi::CString::new("/proc/self/fd/0").unwrap();
+        if libc::open(conf_tests.as_ptr(), libc::O_RDONLY) != -1 {
+            std::process::exit(0);
+        } else {
+            std::process::exit(1);
+        }
+    }
+}

conf_tests/rename_exchange.rs

@@ -0,0 +1,5 @@
+extern crate libc;
+
+fn main() {
+    let does_rename_exchange_exist = libc::RENAME_EXCHANGE;
+}

conf_tests/renameat_flags.rs

@@ -0,0 +1,5 @@
+extern crate libc;
+
+fn main() {
+    let does_renameat2_exist = libc::SYS_renameat2;
+}

examples/exchange.rs

@@ -1,18 +1,16 @@
-extern crate argparse;
-extern crate openat;
-
-use std::process::exit;
 use std::path::PathBuf;
+use std::process::exit;
 
+use openat_ct as openat;
 use argparse::{ArgumentParser, Parse};
 use openat::Dir;
 
-#[cfg(not(target_os="linux"))]
+#[cfg(not(target_os = "linux"))]
 fn main() {
     println!("Atomic exchange is not supported on this platform")
 }
 
-#[cfg(target_os="linux")]
+#[cfg(target_os = "linux")]
 fn main() {
     let mut path1 = PathBuf::new();
     let mut path2 = PathBuf::new();
@@ -32,8 +30,10 @@ fn main() {
     }
     let parent = path1.parent().expect("path must have parent directory");
     let dir = Dir::open(parent).expect("can open directory");
+    #[cfg(feature = "rename_exchange")]
     dir.local_exchange(
         path1.file_name().expect("path1 must have filename"),
         path2.file_name().expect("path2 must have filename"),
-    ).expect("can rename");
+    )
+    .expect("can rename");
 }

rust.yml

@@ -0,0 +1,22 @@
+name: Rust
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose

rustfmt.toml

@@ -0,0 +1,17 @@
+version = "Two"
+#max_width = 120
+#comment_width = 120
+enum_discrim_align_threshold = 40
+struct_field_align_threshold = 40
+
+#license_template_path
+format_macro_matchers = true
+normalize_comments = true
+overflow_delimited_expr = true
+reorder_impl_items = true
+reorder_imports = false
+group_imports = "StdExternalCrate"
+use_field_init_shorthand = true
+
+use_try_shorthand = true
+normalize_doc_attributes = true