simplify project

remove empty object file
reorder imports & remove unneeded
simplify main

Author: CamJN

Makefile

@@ -1,7 +1,7 @@
 CXX=clang++
 CPPFLAGS += -MMD -MP
 CXXFLAGS += --std=c++20 -pedantic-errors -Weverything -Wno-c++98-compat -Wno-pre-c++20-compat-pedantic
-LDFLAGS += -Llib  -fvisibility=default
+LDFLAGS += -Llib -fvisibility=default
 LDLIBS += -lgetargv
 
 .PHONY := run db clean
@@ -10,7 +10,7 @@ LDLIBS += -lgetargv
 run: bin/main
 	bin/main
 
-lib/libgetargv++.dylib: obj/libgetargv++.o obj/argv.o obj/argvargc.o | lib
+lib/libgetargv++.dylib: obj/argv.o obj/argvargc.o | lib
 	$(CXX) -dynamiclib $(CXXFLAGS) $(LDFLAGS) $(LDLIBS) $^ -o $@
 
 bin/main: lib/libgetargv++.dylib obj/main.o | bin
@@ -24,7 +24,7 @@ bin lib obj:
 
 db: compile_commands.json
 
-compile_commands.json:
+compile_commands.json: Makefile
 	bear -- make -B bin/main
 
 clean:

src/argv.cpp

@@ -1,7 +1,5 @@
 #include <cerrno>
-#include <cstdint>
 #include <stdexcept>
-#include <string>
 #include <system_error>
 
 #include "libgetargv++.hpp"

src/argvargc.cpp

@@ -1,6 +1,5 @@
 #include <cerrno>
 #include <stdexcept>
-#include <string>
 #include <system_error>
 
 #include "libgetargv++.hpp"

src/iter.hpp

@@ -2,12 +2,14 @@
 #define ITERGEN
 
 #include <iterator>
+namespace IterGen {
 
 template <typename T> struct Iterator {
   using iterator_concept [[maybe_unused]] = std::contiguous_iterator_tag;
   using difference_type = std::ptrdiff_t;
   using element_type = T;
-  //using value_type = element_type; // ← compiler doesn't seem to need this, but everyone online says it's needed…
+  // using value_type = element_type; // ← compiler doesn't seem to need this,
+  // but everyone online says it's needed…
   using pointer = element_type *;
   using reference = element_type &;
 
@@ -65,4 +67,5 @@ template <typename T> struct Iterator {
 private:
   pointer _ptr;
 };
+} // namespace IterGen
 #endif

src/libgetargv++.cpp

@@ -1,21 +1,21 @@
-#include "iter.hpp"
-#include <cstddef>
-
 #ifndef LIBGETARGVPLUSPLUS_H
 #define LIBGETARGVPLUSPLUS_H
 
+#include "iter.hpp"
+#include <cstddef>
+#include <string>
+#include <vector>
+
 namespace ffi {
 #include <libgetargv.h>
 }
 
-/* TODO:
-  - tests
- */
+// TODO: tests
 
 namespace Getargv {
 
 struct Argv : protected ffi::ArgvResult {
-  using Iterator = Iterator<char>;
+  using Iterator = IterGen::Iterator<char>;
 
   static Argv as_bytes(pid_t pid, unsigned int skip = 0,
                        bool nuls = false) noexcept(false);
@@ -35,15 +35,15 @@ struct Argv : protected ffi::ArgvResult {
 };
 
 struct ArgvArgc : protected ffi::ArgvArgcResult {
-  using Iterator = Iterator<char *>;
+  using Iterator = IterGen::Iterator<char *>;
 
   static ArgvArgc as_array(pid_t pid) noexcept(false);
   static std::vector<std::string> as_string_array(pid_t pid) noexcept(false);
   ArgvArgc(ArgvArgc &r) = delete;
   ArgvArgc(ffi::ArgvArgcResult &r);
   ~ArgvArgc();
 
-  char *&operator[](const ptrdiff_t index) const;
+  char *&operator[](const ptrdiff_t index) const;//auto converts to std::string
   ptrdiff_t size() const;
   bool empty() const;
   Iterator begin() const;

src/libgetargv++.hpp

@@ -1,33 +1,26 @@
 #include <algorithm>
+#include <iostream>
 #include <type_traits>
 #include <unistd.h>
 
 #include "libgetargv++.hpp"
 using Getargv::Argv;
 using Getargv::ArgvArgc;
 
-#include <iostream>
+int main(int argc, char *argv[]) {
+  char **end = argv + argc;
+  bool nuls =
+      (argc > 1) && std::find_if(argv, end, [](auto c) { return c == "-0"; });
 
-int main() {
-  pid_t pid = getpid();
+  char **itr = std::find(argv, end, "-s");
+  unsigned int skip = (itr != end && ++itr != end) ? static_cast<unsigned int>(std::stoul(*itr)) : 0;
+
+  pid_t pid = (argc > 1) ? std::stoi(argv[argc - 1]) : getpid();
 
   static_assert(std::contiguous_iterator<Argv::Iterator>);
   static_assert(std::contiguous_iterator<ArgvArgc::Iterator>);
 
-  ArgvArgc array = ArgvArgc::as_array(pid);
-  for (auto s : array) {
-    std::cout << std::string(s) << "\n";
-  }
-  std::cout << "length: " << array.size() << "\n";
-  std::cout << "length: " << std::distance(array.begin(), array.end()) << "\n";
-
-  Argv bytes = Argv::as_bytes(pid);
-  for (auto c : bytes) {
-    std::cout << c << "\n";
-  }
-
-  std::cout << "length: " << bytes.size() << "\n";
-  std::cout << "length: " << std::distance(bytes.begin(), bytes.end()) << "\n";
+  Argv bytes = Argv::as_bytes(pid, skip, nuls);
 
   if (!bytes.print()) {
     std::cerr << "printing fucked up\n";