Rework file tree, headers in src/inc

src/compression.c

@@ -6,8 +6,8 @@
 // lz1 https://github.com/andyherbert/lz1
 //
 
-#include "deps.h"
-#include "compression.h"
+#include "inc/deps.h"
+#include "inc/compression.h"
 
 //--------------------------------------------------------------------
 

src/enc.c

@@ -5,8 +5,8 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "enc.h"
+#include "inc/deps.h"
+#include "inc/enc.h"
 
 char *ss_encrypt(char *string)
 {

src/functions.c

@@ -5,19 +5,19 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "functions.h"
-#include "util.h"
-#include "vars.h"
-#include "enc.h"
-#include "math.h"
-#include "md5.h"
-#include "network.h"
-#include "search.h"
-#include "inset.h"
+#include "inc/deps.h"
+#include "inc/functions.h"
+#include "inc/util.h"
+#include "inc/vars.h"
+#include "inc/enc.h"
+#include "inc/math.h"
+#include "inc/md5.h"
+#include "inc/network.h"
+#include "inc/search.h"
+#include "inc/inset.h"
 // For slidescript compression algorithm
-#include "tar.h"
-#include "compression.h"
+#include "inc/tar.h"
+#include "inc/compression.h"
 
 char *process_line(char *line)
 {

src/inc/deps.h

@@ -13,6 +13,9 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <dirent.h>
+#include <grp.h>
+#include <pwd.h>
 #include <signal.h>
 #include <regex.h>
 #include <limits.h>
@@ -20,10 +23,15 @@
 #include "config.h"
 #include "sbyteswap.h"
 #include <sys/types.h>
+#include <sys/select.h>
 // Networking
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+// For tar containers
+#if !defined(__APPLE__)
+#include <sys/sysmacros.h>
+#endif
 // For file handling
 #include <assert.h>
 #include <sys/stat.h>

src/inc/tar.h

@@ -30,26 +30,6 @@ THE SOFTWARE
 #define _DEFAULT_SOURCE
 #endif
 
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#if !defined(__APPLE__)
-#include <sys/sysmacros.h>
-#endif
-#include <sys/select.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-
 #define DEFAULT_DIR_MODE S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH // 0755
 
 #define BLOCKSIZE       512

src/inset.c

@@ -5,11 +5,11 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "inset.h"
-#include "functions.h"
-#include "vars.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/inset.h"
+#include "inc/functions.h"
+#include "inc/vars.h"
+#include "inc/util.h"
 
 BQ s_bqf [MAX_BQ_FUNCTIONS];
 

src/main.c

@@ -7,11 +7,11 @@
 
 #define MY_GLOBAL
 
-#include "deps.h"
-#include "util.h"
-#include "functions.h"
-#include "pipe.h"
-#include "vars.h"
+#include "inc/deps.h"
+#include "inc/util.h"
+#include "inc/functions.h"
+#include "inc/pipe.h"
+#include "inc/vars.h"
 
 int main(int argc, char **argv) 
 {

src/math.c

@@ -5,9 +5,9 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "math.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/math.h"
+#include "inc/util.h"
 
 EXPR sexpr [MAX_EXPR_ARGS];
 

src/md5.c

@@ -9,8 +9,8 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "md5.h"
+#include "inc/deps.h"
+#include "inc/md5.h"
 
 #define ZERO    0
 #define ONE     1

src/network.c

@@ -5,9 +5,9 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "network.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/network.h"
+#include "inc/util.h"
 
 // Structure of file types for nethttp
 // mimetype struct, searched through when checking mimetype

src/pipe.c

@@ -6,10 +6,10 @@
 */
 
 
-#include "deps.h"
-#include "vars.h"
-#include "pipe.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/vars.h"
+#include "inc/pipe.h"
+#include "inc/util.h"
 
 void set_cmd(int index, char *cmd)
 {

src/search.c

@@ -5,9 +5,9 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "search.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/search.h"
+#include "inc/util.h"
 
 regex_t pattern;
 

src/tar.c

@@ -1,4 +1,5 @@
-#include "tar.h"
+#include "inc/deps.h"
+#include "inc/tar.h"
 
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))

src/util.c

@@ -6,8 +6,8 @@
 */
 
 
-#include "deps.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/util.h"
 
 time_t current_time;
 

src/vars.c

@@ -5,9 +5,9 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "vars.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/vars.h"
+#include "inc/util.h"
 
 void set_var(int index, char *varname, char *vardata)
 {