Implementing history load/store

Makefile.am

@@ -1,22 +1,29 @@
 bin_PROGRAMS = asmsh child
 
 libcheck_asmsh_a_SOURCES = mmap_parse.c asm_env.c compile.c logger.c \
-			   completion.c shell.c shell_cmds.c shell_sym.c
+			   completion.c shell.c shell_cmds.c shell_sym.c \
+			   history.c
 
 asmsh_SOURCES = asmsh.c $(libcheck_asmsh_a_SOURCES)
 child_SOURCES = child.s
 
+asmsh_LDADD=child_bin.o
 asmsh_LDFLAGS=-g -O2
 
-CCASFLAGS=-g -O0
+AM_CFLAGS=-Wall
+AM_CCASFLAGS=-g -O0
 child_LDFLAGS=-nostdlib
 
 child$(EXEEXT): $(child_SOURCES:.s=.o)
-	ld -g -o $@ $^
+	$(LD) -s -o $@ $^
+
+child_bin.o: child$(EXEEXT)
+	$(LD) -r -b binary -o $@ $<
 
 SUBDIRS = 
 if CHECK
 noinst_LIBRARIES = libcheck_asmsh.a
+libcheck_asmsh_a_LDDADD=child_bin.o
 
 if HAVE_GCOV
 libcheck_asmsh_a_CFLAGS = @CFLAGS@ -fprofile-arcs -ftest-coverage
@@ -34,7 +41,7 @@ LCOV_HTML=lcov_html
 TO_LOCAL_CLEAN += $(LCOV_INFO) $(LCOV_HTML)
 
 $(LCOV_INFO): gcov
-	$(LCOV) --capture --no-recursion --directory . --output-file $@
+	$(LCOV) --base-directory $(top_builddir) --capture --no-recursion --directory . --output-file $@
 
 $(LCOV_HTML): $(LCOV_INFO)
 	genhtml $< --output-directory $@

asmsh.c

@@ -23,6 +23,7 @@
 #include "logger.h"
 #include "shell.h"
 #include "completion.h"
+#include "history.h"
 
 int main(int argc, char *argv[], char *envp[])
 {
@@ -48,6 +49,9 @@ int main(int argc, char *argv[], char *envp[])
 	rl_basic_word_break_characters=" \t\n";
 	rl_attempted_completion_function =  asmsh_rl_completion;
 
+	char * hpath = history_filename_init(NULL);
+	load_history(hpath, add_history);
+
 	while(1)
 	{
 		snprintf(prompt, sizeof(prompt)-1,
@@ -74,10 +78,22 @@ int main(int argc, char *argv[], char *envp[])
 		add_history(cmd);
 	}
 
+end:
 	asmsh_cleanup(&sh);
+
+	HIST_ENTRY **hist = history_list();
+	int hist_count = 0;
+	for(HIST_ENTRY **p=hist; *p;p++){ hist_count++; }
+	const char **hstr = alloca((hist_count+1)*sizeof(char*));
+	for(int i=0; i<hist_count; i++){ hstr[i] = hist[i]->line; }
+	hstr[hist_count]=NULL;
+
+	save_history(hpath, hstr);
+	free(hpath);
+
 	return ret;
 
 err:
-	asmsh_cleanup(&sh);
-	return 1;
+	ret = 1;
+	goto end;
 }

history.c

@@ -0,0 +1,107 @@
+#include "history.h"
+
+char * history_filename_init(const char *homedir)
+{
+	const char fmt[] = "%s/.local/share/asmsh";
+	char *path;
+	int sz;
+	int fd = open("/dev/null", O_WRONLY);
+	if(!fd)
+	{
+		perror("Unable to open /dev/null");
+		return NULL;
+	}
+	const char *home = homedir?homedir:getenv("HOME");
+	if(!home)
+	{
+		dprintf(2, "No $HOME variable found\n");
+		return NULL;
+	}
+	sz = dprintf(fd, fmt, home);
+	if(sz < 0)
+	{
+		perror("Not able to format local share folder");
+		return NULL;
+	}
+	
+	path = alloca(sz+1);
+	sprintf(path, fmt, home);
+	path[sz]='\0';
+	if(access(path, F_OK) < 0)
+	{
+		mkdir(path, 0755);
+	}
+	char *res = malloc(sz+strlen(ASMSH_HISTORY_FILE)+3);
+	if(!res)
+	{
+		perror("Unable tot allocate history filename");
+		return NULL;
+	}
+	sz = sprintf(res, "%s/%s", path, ASMSH_HISTORY_FILE);
+	res[sz] = '\0';
+	return res;
+}
+
+
+int save_history(const char *history_path, const char * const *hists)
+{
+	int fd = open(history_path, O_WRONLY|O_CREAT|O_TRUNC, 0744);
+	if(fd < 0)
+	{
+		perror("Unable to open history file");
+		dprintf(2, "could not save history in %s\n", history_path);
+		return -1;
+	}
+	for(const char * const *hist=hists; *hist; hist++)
+	{
+		dprintf(fd, "%s\n", *hist);
+	}
+	close(fd);
+	return 0;
+}
+
+int load_history(const char *history_path, add_history_f *add_h)
+{
+	if(access(history_path, F_OK) < 0) { return 0; }
+
+	int readed, wanted;
+	int fd = open(history_path, O_RDONLY);
+	char buf[4096], *cur, *line;
+	if(fd < 0)
+	{
+		perror("Unable to open history file");
+		return -1;
+	}
+
+	cur = buf;
+	wanted = sizeof(buf)-1;
+	do
+	{
+		readed = read(fd, cur, wanted);
+		if(readed < 0)
+		{
+			perror("Unable to read history file");
+			close(fd);
+			return -1;
+		}
+		cur[readed]='\0';
+		for(line=cur=buf; *cur; cur++)
+		{
+			if(*cur=='\n')
+			{
+				*cur='\0';
+				if(cur-line>1 && *line != '#')
+				{
+					add_h(line);
+				}
+				line = cur+1;
+			}
+		}
+		if(*line)
+		{
+			wanted = sizeof(buf) - (strlen(line)+1);
+			memmove(buf, line, strlen(line)+1);
+		}
+	}while(readed && readed == wanted);
+	close(fd);
+}

history.h

@@ -0,0 +1,41 @@
+/* Copyright Yann Weber <asmsh@yannweb.net>
+   This file is part of asmsh.
+
+   asmsh is free software: you can redistribute it and/or modify it under the
+   terms of the GNU General Public License as published by the Free Software
+   Foundation, either version 3 of the License, or any later version.
+   
+   asmsh is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+   FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+   details.
+   
+   You should have received a copy of the GNU General Public License along
+   with asmsh. If not, see <https://www.gnu.org/licenses/>.
+*/
+#ifndef ASMSH_HISTORY_H
+#define ASMSH_HISTORY_H
+#include "config.h"
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+static const char ASMSH_HISTORY_FILE[] = "asmsh.history";
+
+typedef void(add_history_f)(const char*);
+
+/** Return the history filename and create the directory if needed
+ * @note the returned string should be freed after use
+ * @param const char * if NULL use $HOME
+ */
+char * history_filename_init(const char *homedir);
+
+int save_history(const char *history_path, const char* const* hists);
+int load_history(const char *history_path, add_history_f *add_h);
+
+#endif

tests/regen.sh

@@ -15,6 +15,8 @@ TESTLIB_NAME=libcheck_asmsh.a
 TESTLIB=\$(top_builddir)/\$(TESTLIB_NAME)
 CHILD_NAME=child
 CHILD=\$(top_builddir)/\$(CHILD_NAME)
+CHILD_OBJNAME=child_bin.o
+CHILD_OBJ=\$(top_builddir)/\$(CHILD_OBJNAME)
 
 BUILT_SOURCES = \$(CHILD)
 
@@ -27,6 +29,9 @@ clean-local:
 \$(TESTLIB):
 	make -C \$(top_builddir) \$(TESTLIB_NAME)
 
+\$(CHILD_OBJ):
+	make -C \$(top_builddir) \$(CHILD_OBJNAME)
+
 .PHONY: \$(TESTLIB) \$(CHILD)
 __EOF__
 
@@ -35,7 +40,7 @@ do
 	cat << __EOF__ >> Makefile.am
 ${p}_SOURCES = ${p}.c
 ${p}_CFLAGS = @CHECK_CFLAGS@ -fprofile-arcs -ftest-coverage
-${p}_LDADD = \$(TESTLIB) @CHECK_LIBS@
+${p}_LDADD = \$(TESTLIB) \$(CHILD_OBJ)  @CHECK_LIBS@
 __EOF__
 
 done

tests/samples/sample.history

@@ -0,0 +1,3 @@
+hello world!
+mov $1312, %rax
+syscall