Work in progress. Import githooks to this project.

Author: diagprov

.editorconfig

@@ -5,7 +5,31 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 indent_size = 4
+tab_width = 4
 indent_style = space
 
-[{Makefile, *,mk}]
-insend_style = tab
+[*.{c, cpp, h, hpp, cxx, hxx, rs, go, java}]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_size = 4
+tab_width = 4
+indent_style = space
+
+[*.{yaml, json}]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = false
+indent_size = 2
+tab_width = 2
+indent_style = space
+
+[Makefile]
+indent_style = tab
+indent_size = 8
+tab_width = 8
+
+[*.mk]
+indent_style = tab
+indent_size = 8
+tab_width = 8

.githooks/pre-commit

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+echo
+count=0
+replacedirective=0
+
+echo "Checking for merge conflicts"
+for f in `git diff HEAD --name-only --diff-filter=M`; do
+    if [[ -f $f ]] && [[ $f != .githooks/* ]]; then
+        if [[ $(grep -c "<<<<<<" $f) -gt 0 ]] || [[ $(grep -c ">>>>>>" $f) -gt 0 ]]; then
+            echo "$(tput setaf 1)! $f$(tput sgr0)"
+            ((count += 1))
+        fi
+    fi
+done
+
+if [ $count != 0 ]; then
+    echo "$(tput setaf 1)$count$(tput sgr0) files conflict, please resolve conflicts."
+    exit 1;
+else
+    echo "$(tput setaf 2)No conflicts, continuing with commit.$(tput sgr0)"
+fi
+

scripts/devinit.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+GIT_VERSION=$(git --version | cut -d" " -f3)
+GIT_REQUIRED_VERSION=2.9.0
+
+if [ "$(printf '%s\n' "$GIT_REQUIRED_VERSION" "$GIT_VERSION" | sort -V | head -n1)" = "$GIT_REQUIRED_VERSION" ]; then 
+    echo "GIT >= 2.9, installing .githooks directory"
+    git config core.hooksPath .githooks
+else
+    echo "Copying githooks to .git"
+    #find .git/hooks -type l -exec rm {} \; && find .githooks -type f -exec ln -sf ../../{} .git/hooks/ \;
+fi

src/e4cli.c

@@ -18,6 +18,83 @@
 #define E4_STORE_FILE
 #include "e4/e4.h"
 
+const char cli_commands[] = "
+The following commands can be used:
+
+    !setid
+    !setkey
+    !genkey
+    !settopickey
+    !s, !subscribe
+    !u, !unsubscribe
+    !c, !changetopic
+    !e, !e4msg
+    !m, !clearmsg
+    !l, !list state
+    !z, !zero state
+    !q, !quit
+";
+
+void repl() {
+
+    char line[256] = {0};
+    int i = 0;
+
+    while (fgets(line, sizeof(line), stdin) != NULL) {
+
+        char* command = NULL;
+        char* arg = NULL;
+
+        int linelen = strlen(line);
+        
+
+        // user pressed enter/entered nothing except a newline.
+        if (linelen == 1 ) {
+            continue;
+        }
+
+        // remove trailing new line from fgets()
+        if (linelen >= 1 && line[l-1] == '\n') {
+            line[--linelen] = 0;
+        }
+
+        if (line[0] != '!')
+        {
+            // TODO: what do we do here?
+            continue;
+        }
+
+        for (i=1; i < linelen; i++ ){
+            if (i == linelen-1)  {
+                command = &line[1];
+                break;
+            }
+            if (line[i]==' ') {
+                line[i] = 0;
+                command = &line[1];
+                // don't assign if i = linelen-1; potential buffer overflow.
+                if ( i+1 < linelen ) {
+                    arg = &line[i+];
+                }
+                break
+            }
+            
+        }
+
+        if ( command == NULL ) {
+            // error, let's do something about it?
+            continue
+        }
+
+        if (strcmp(commmand, "")
+
+    }
+}
+
+void init() {
+
+}
+
 int main(int argc, char** argv) {
 
-}
+}