Merge branch 'proh14:main' into cat

.github/workflows/build.yml

@@ -1,6 +1,9 @@
 on:
   workflow_dispatch:
+  pull_request:
+    branches: [ main ]
   push:
+    branches: [ main ]
 
 jobs:
   check_build:

.github/workflows/flake-check.yml

@@ -1,6 +1,9 @@
 on:
   workflow_dispatch:
+  pull_request:
+    branches: [ main ]
   push:
+    branches: [ main ]
     paths:
       - "**.nix"
       - "**.lock"

.github/workflows/fmt-check.yml

@@ -1,6 +1,9 @@
 on:
   workflow_dispatch:
+  pull_request:
+    branches: [ main ]
   push:
+    branches: [ main ]
     paths:
       - "**.c"
       - "**.h"
@@ -26,4 +29,4 @@ jobs:
               | xargs           \
               | tee /dev/stderr \
               | wc -c)
-          [ $out -ge 1 ] && exit 1 || exit 0
+          [ $out -gt 1 ] && exit 1 || exit 0

.gitignore

@@ -90,3 +90,4 @@ result
 # config
 .cache
 compile_commands.json
+.pre-commit-config.yaml

commons.mk

@@ -4,7 +4,7 @@ CFLAGS := @$/compile_flags.txt
 
 CFLAGS += -ffunction-sections -fdata-sections
 CFLAGS += -Wp,-U_FORTIFY_SOURCE
-CFLAGS += -iquote src
+CFLAGS += -iquote $/src
 
 LDFLAGS := -fwhole-program -flto
 LDFLAGS += -Wl,--gc-sections

flake.nix

@@ -2,12 +2,20 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    pre-commit-hooks = {
+      url = "github:cachix/git-hooks.nix";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
   };
 
   outputs = {
     self,
     nixpkgs,
     flake-utils,
+    pre-commit-hooks,
   }:
     flake-utils.lib.eachSystem [
       "aarch64-darwin"
@@ -16,11 +24,27 @@
       "x86_64-linux"
     ] (system: let
       pkgs = nixpkgs.legacyPackages.${system};
-    in {
+    in rec {
       formatter = pkgs.alejandra;
 
+      checks = let
+        pre-commit-check = pre-commit-hooks.lib.${system}.run {
+          src = ./.;
+          hooks = {
+            alejandra.enable = true;
+            clang-format.enable = true;
+          };
+        };
+      in
+        if (builtins.elem system flake-utils.lib.defaultSystems)
+        then {inherit pre-commit-check;}
+        else {};
+
       devShells.default = pkgs.mkShell {
-        # inputsFrom = pkgs.lib.attrsets.attrValues packages;
+        inherit (checks.pre-commit-check) shellHook;
+
+        hardeningDisable = ["fortify"];
+        inputsFrom = pkgs.lib.attrsets.attrValues packages;
         packages = with pkgs; [
           bear
           python3Packages.compiledb

src/echo/echo.c

@@ -7,10 +7,7 @@
 #define VERSION "1.0.0"
 #define AUTHOR "Hoorad Farrokh (proh14)"
 
-#define print_version()                                                        \
-  do {                                                                         \
-    printf("%s\nversion: %s\nby: %s\n", NAME, VERSION, AUTHOR);                \
-  } while (0)
+#include "version_info.h"
 
 int isoctal(int c) { return (c >= '0' && c <= '7'); }
 

src/getopt.c

@@ -0,0 +1,96 @@
+#include "./getopt.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+char *optarg = NULL;
+int optind = 1, opterr = 0, optopt = '\0';
+
+static void getopt_printerr(const char *msg) {
+  if (opterr) {
+    fprintf(stderr, "%s", msg);
+  }
+}
+
+static int getopt_in(char d, const char *str) {
+  int i = 0;
+  while (str[i] != '\0') {
+    if (d == str[i] && str[i] != ':') {
+      return i;
+    }
+    i++;
+  }
+  return 0;
+}
+
+static void getopt_exchange(char *argv[], int i, int j) {
+  char *tmp = argv[i];
+  argv[i] = argv[j];
+  argv[j] = tmp;
+}
+
+int getopt(int argc, char **argv, const char *optstring) {
+  int c;
+  static char *nextchar = NULL;
+  static int coropt = 1;
+  if (!coropt) {
+    coropt = 1;
+  }
+
+  if (coropt >= argc || argv[coropt] == NULL) {
+    return -1;
+  }
+
+  while (argv[coropt] && argv[coropt][0] != '-') {
+    coropt++;
+  }
+
+  if (nextchar == NULL || *nextchar == '\0') {
+    if (coropt >= argc) {
+      return -1;
+    }
+    nextchar = &argv[coropt][1];
+  }
+
+  int idx;
+  if (!((idx = getopt_in(*nextchar, optstring)) >= 0)) {
+    getopt_printerr("invalid option\n");
+    optopt = *nextchar;
+    return '?';
+  }
+
+  c = *nextchar++;
+  if (*nextchar == '\0') {
+    coropt++;
+    nextchar = NULL;
+  }
+
+  if (optstring[idx + 1] != ':') {
+    coropt--;
+    optind++;
+    goto exit;
+  }
+
+  if (nextchar != NULL && *nextchar != '\0') {
+    coropt++;
+  }
+
+  if (coropt >= argc || argv[coropt][0] == '-') {
+    getopt_printerr("option requires an argument\n");
+    optopt = *nextchar;
+    return '?';
+  }
+
+  optarg = argv[coropt];
+
+exit: {
+  int i = coropt;
+  int j = coropt - 1;
+  while (j >= 0 && argv[j][0] != '-') {
+    getopt_exchange(argv, i, j);
+    i--;
+    j--;
+  }
+}
+  optind++;
+  return c;
+}

src/getopt.h

@@ -0,0 +1,23 @@
+// Reimplementation of GNU getopt
+#ifndef _GETOPT_H_
+#define _GETOPT_H_
+
+struct option {
+  const char *name;
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+extern char *optarg;
+extern int optind, opterr, optopt;
+
+int getopt(int argc, char **argv, const char *optstring);
+
+int getopt_long(int argc, char *const argv[], const char *optstring,
+                const struct option *longopts, int *longindex);
+
+int getopt_long_only(int argc, char *const argv[], const char *optstring,
+                     const struct option *longopts, int *longindex);
+
+#endif // _GETOPT_H_

src/ls/ls_main.c

@@ -8,10 +8,7 @@
 #define VERSION "1.0.0"
 #define AUTHOR "Yohann Boniface (Sigmanificient)"
 
-#define print_version()                                                        \
-  do {                                                                         \
-    printf("%s\nversion: %s\nby: %s\n", NAME, VERSION, AUTHOR);                \
-  } while (0)
+#include "version_info.h"
 
 static const char FLAGLIST[] = "alRdrt";
 static char DEFAULT_LOCATION[] = ".";
@@ -62,8 +59,10 @@ int main(int argc, char **argv) {
   int err = 0;
 
   for (int i = 0; argv[i] != NULL; i++)
-    if (!strcmp(argv[i], "--version"))
-      return printf(VERSION), EXIT_SUCCESS;
+    if (!strcmp(argv[i], "--version")) {
+      print_version();
+      return EXIT_SUCCESS;
+    }
   flags = compose_flaglist(argc, argv);
   db.entries = malloc(db.size * sizeof(*db.entries));
   if (db.entries == NULL)