Changed some stuff so that it will compile under arch linux.

Author: oxagast

Makefile.am

@@ -16,7 +16,7 @@ libgzstream_a_SOURCES = include/gzstream/gzstream.h include/gzstream/gzstream.cp
 if OS_IS_KALI
 SUBDIRS = include/gzstream/
 endif
-ansvif_SOURCES = src/log.cpp src/bin2hex.cpp src/popen2.cpp src/main.cpp src/help.cpp src/match_fault.cpp src/sys_string.cpp src/man_read.cpp src/trash.cpp src/randomizer.cpp src/remove_chars.cpp src/to_int.cpp src/file_check.cpp src/reaper.cpp src/write_file.cpp src/templates.cpp src/oxagast.cpp include/gzstream/gzstream.h include/xmlwriter/xml_writer.hpp src/version.h
+ansvif_SOURCES = src/log.cpp src/bin2hex.cpp src/popen2.cpp src/main.cpp src/help.cpp src/match_fault.cpp src/sys_string.cpp src/man_read.cpp src/trash.cpp src/randomizer.cpp src/remove_chars.cpp src/to_int.cpp src/file_check.cpp src/reaper.cpp src/write_file.cpp src/templates.cpp src/oxagast.cpp src/version.h include/gzstream/gzstream.h include/xmlwriter/xml_writer.hpp include/stack.h
 if OS_IS_REDHAT
 ansvif_LDADD = -lgzstream -lstdc++ -lpthread -lz -L.
 ansvif_LDFLAGS = -I./include/gzstream -I./include/xml_writer -I./src/linux
@@ -27,6 +27,11 @@ ansvif_LDADD = -lgzstream -lstdc++ -lpthread -lz -L.
 ansvif_LDFLAGS = -I./include/gzstream -I./include/xml_writer -I./src/linux
 ansvif_CPPFLAGS = -O3 -D __DEBIAN__ -D __NOTANDROID__ -Wall -std=c++11 -ftemplate-depth=1024
 endif
+if OS_IS_ARCH
+ansvif_LDADD = -lgzstream -lstdc++ -lpthread -lz -L.
+ansvif_LDFLAGS = -I./include/gzstream -I./include/xml_writer -I./src/linux
+ansvif_CPPFLAGS = -O3 -D __ARCH__ -D __NOTANDROID__ -Wall -std=c++11 -ftemplate-depth=1024
+endif
 if OS_IS_FREEBSD
 ansvif_LDADD = -lstdc++ -lz -L.
 ansvif_LDFLAGS = -I./include/gzstream -I./include/xml_writer -I./src/linux -pthread

ansvif.i64

@@ -84,6 +84,11 @@ if test "$OS_IS_KALI" = "0"; then
    AC_DEFINE([__KALI__], [], ["build for Kali"])
    AC_MSG_NOTICE([trying to build for a Kali based system])
 fi
+AM_CONDITIONAL(OS_IS_ARCH, [ test `grep "Arch" /etc/os-release | wc -l` -gt "0" ])
+if test "$OS_IS_ARCH" = "0"; then
+   AC_DEFINE([__ARCH__], [], ["build for Arch"])
+   AC_MSG_NOTICE([trying to build for a Arch based system])
+fi
 AM_CONDITIONAL(OS_IS_FREEBSD, [ test `uname -o` == "FreeBSD" ])
 if test "$IS_IS_FREEBSD" = "0"; then
     AC_DEFINE([__UNKNOWN], [], ["build for FreeBSD"])

configure.ac

@@ -5,7 +5,7 @@
 # define INDENT "  "
 # define NEWLINE "\n"
 
-# include <string.h>
+#include <string.h>
 #ifdef __NOTANDROID__
 #include "include/stack.h"
 #endif
@@ -15,7 +15,7 @@
 #ifdef __WIN32
 #include "../stack.h"
 #endif
-# include <iostream>
+#include <iostream>
 
 class Writer
 {

include/xmlwriter/xml_writer.hpp

@@ -1,23 +1,22 @@
 #ifdef __NOTANDROID__
-#include "../include/xmlwriter/xml_writer.hpp"
-#endif
-#ifdef __ANDROID__
-#include "../include/xmlwriter/xml_writer.hpp"
-#endif
-#ifdef __NOTANDROID__
 #include "src/version.h"
 #endif
 #ifdef __ANDROID__
 #include "version.h"
 #endif
 #ifdef _WIN32
 #include "version.h"
-#include "../include/xmlwriter/xml_writer.hpp"
 #endif
+#ifdef __linux__
+#include "version.h"
+#endif
+#include "../include/stack.h"
+#include "../include/xmlwriter/xml_writer.hpp"
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
 #include <sstream>
+#include <iostream>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>

src/log.cpp

@@ -546,6 +546,8 @@ bool match_seg(struct Options o, struct RunCommands runit, struct Monopoly go, s
             exit(64);
           }
         }
+
       }
       return (true);
+
     }