From b8209a2349ffb2153e0c17f43412f2c9906aa8d0 Mon Sep 17 00:00:00 2001 From: louie Date: Mon, 28 Dec 2020 15:34:29 -0800 Subject: Moved headers to separate directory --- Makefile | 18 ++++++++---------- draw.c | 15 +++++++-------- draw.h | 15 --------------- entry.c | 8 ++++---- entry.h | 28 ---------------------------- group.c | 8 ++++---- group.h | 40 ---------------------------------------- include/draw.h | 15 +++++++++++++++ include/draw_extend.h | 6 ++++++ include/entry.h | 28 ++++++++++++++++++++++++++++ include/group.h | 40 ++++++++++++++++++++++++++++++++++++++++ include/read_cfg.h | 26 ++++++++++++++++++++++++++ include/read_cfg_extend.h | 12 ++++++++++++ read_cfg.c | 9 ++++++--- read_cfg.h | 26 -------------------------- unix/draw.c | 5 +++-- unix/draw.h | 6 ------ unix/read_cfg.c | 6 +++--- unix/read_cfg.h | 12 ------------ windows/draw.c | 9 +++++---- windows/draw.h | 6 ------ windows/read_cfg.c | 6 +++--- windows/read_cfg.h | 12 ------------ 23 files changed, 170 insertions(+), 186 deletions(-) delete mode 100644 draw.h delete mode 100644 entry.h delete mode 100644 group.h create mode 100644 include/draw.h create mode 100644 include/draw_extend.h create mode 100644 include/entry.h create mode 100644 include/group.h create mode 100644 include/read_cfg.h create mode 100644 include/read_cfg_extend.h delete mode 100644 read_cfg.h delete mode 100644 unix/draw.h delete mode 100644 unix/read_cfg.h delete mode 100644 windows/draw.h delete mode 100644 windows/read_cfg.h diff --git a/Makefile b/Makefile index ad0bdab..46ca905 100644 --- a/Makefile +++ b/Makefile @@ -9,25 +9,23 @@ ifeq ($(OS),Windows_NT) $(NAME): draw.o read_cfg.o group.o entry.o windows/draw.o windows/read_cfg.o $(CC) -o $(NAME) draw.o read_cfg.o group.o entry.o windows/draw.o windows/read_cfg.o $(LIBS) -draw.o: draw.c read_cfg.h group.h entry.h windows/draw.h windows/read_cfg.h -windows/draw.o: windows/draw.c windows/draw.h draw.h -read_cfg.o: read_cfg.c group.o entry.o windows/read_cfg.h -windows/read_cfg.o: windows/read_cfg.c windows/read_cfg.h read_cfg.h +windows/draw.o: windows/draw.c include/draw.h include/draw_extend.h +windows/read_cfg.o: windows/read_cfg.c include/read_cfg.h include/read_cfg_extend.h else $(NAME): draw.o read_cfg.o group.o entry.o unix/draw.o unix/read_cfg.o $(CC) -o $(NAME) draw.o read_cfg.o group.o entry.o unix/draw.o unix/read_cfg.o $(LIBS) -draw.o: draw.c read_cfg.h group.h entry.h unix/draw.h unix/read_cfg.h -unix/draw.o: unix/draw.c unix/draw.h draw.h -read_cfg.o: read_cfg.c group.o entry.o unix/read_cfg.h -windows/read_cfg.o: unix/read_cfg.c unix/read_cfg.h read_cfg.h +unix/draw.o: unix/draw.c include/draw.h include/draw_extend.h +unix/read_cfg.o: unix/read_cfg.c include/read_cfg.h include/read_cfg_extend.h endif -group.o: group.c group.h entry.h -entry.o: entry.c entry.h read_cfg.h group.h +draw.o: draw.c include/draw.h include/draw_extend.h include/entry.h include/group.h include/read_cfg.h include/read_cfg_extend.h +read_cfg.o: read_cfg.c include/entry.h include/group.h include/read_cfg_extend.h +group.o: group.c include/entry.h include/group.h include/read_cfg.h +entry.o: entry.c include/entry.h include/group.h include/read_cfg.h .PHONY: clean diff --git a/draw.c b/draw.c index b9d73d9..dd0eb89 100644 --- a/draw.c +++ b/draw.c @@ -6,18 +6,17 @@ //Windows/Unix Compatability #if defined _WIN32 || defined _WIN64 #include -#include "windows/draw.h" -#include "windows/read_cfg.h" #else #include -#include "unix/draw.h" -#include "unix/read_cfg.h" #endif -#include "entry.h" -#include "group.h" -#include "read_cfg.h" -#include "draw.h" +//*_extend.h headers handle differences in os (i.e. windows vs unix) +#include "include/draw.h" +#include "include/draw_extend.h" +#include "include/entry.h" +#include "include/group.h" +#include "include/read_cfg.h" +#include "include/read_cfg_extend.h" #define MAX_LEN 6 #define GAP_SIZE 1 #define WIDTH (getmaxx(stdscr)) //width of the entire term diff --git a/draw.h b/draw.h deleted file mode 100644 index 275b8bb..0000000 --- a/draw.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef DRAW_H -#define DRAW_H - -//These functions are needed by either unix/draw.c or windows/draw.c and must be supplied via a header file - -#define BUF_LEN 1024 - -extern int g_hover; -extern int e_hover; -extern struct group **g; -extern struct entry **e; - -char *get_launch(); - -#endif diff --git a/entry.c b/entry.c index 89bed22..6dc5699 100644 --- a/entry.c +++ b/entry.c @@ -5,10 +5,10 @@ #include #include #include -#include "entry.h" -#include "group.h" -#include "read_cfg.h" -#define BUF_LEN 1024 + +#include "include/entry.h" +#include "include/group.h" +#include "include/read_cfg.h" typedef struct entry{ char name[BUF_LEN]; diff --git a/entry.h b/entry.h deleted file mode 100644 index 51e43ca..0000000 --- a/entry.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ENTRY_H -#define ENTRY_H - -typedef struct entry ENTRY; - -ENTRY *create_entry(char *new_name, char *new_path, bool force); - -void entry_rm(ENTRY *e, ENTRY *prev); - -void clear_entries(ENTRY *head); - -int entry_add(ENTRY *head, ENTRY *tail, ENTRY *add); - -ENTRY **get_entries(ENTRY *head, int count); - -char *get_ename(ENTRY *e); - -char *get_epath(ENTRY *e); - -bool get_eforce(ENTRY *e); - -void set_hide(ENTRY *e, bool status); - -bool get_hide(ENTRY *e); - -void entry_debug(ENTRY *trav); - -#endif diff --git a/group.c b/group.c index b7c7de0..0c0d5a0 100644 --- a/group.c +++ b/group.c @@ -4,10 +4,10 @@ #include #include #include -#include "entry.h" -#include "group.h" -#include "read_cfg.h" -#define BUF_LEN 1024 + +#include "include/entry.h" +#include "include/group.h" +#include "include/read_cfg.h" typedef struct group{ char name[BUF_LEN]; diff --git a/group.h b/group.h deleted file mode 100644 index ab6f409..0000000 --- a/group.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef GROUP_H -#define GROUP_H - -typedef struct group GROUP; - -GROUP *create_group(char *new_name); - -void group_add(char *gname, ENTRY *addme); - -void group_rm(GROUP *g); - -void clean_groups(); //remove empty groups from linked list - -GROUP **get_groups(); - -char *get_gname(GROUP *g); - -char *get_gprog(GROUP *g); - -void set_gprog(GROUP *g, char *p); - -char *get_gflags(GROUP *g); - -void set_gflags(GROUP *g, char *p); - -ENTRY *get_ghead(GROUP *g); - -int get_ecount(GROUP *g); - -void set_ecount(GROUP *g, int new_count); //for use in hiding entries - -void set_gquotes(GROUP *g, bool b); - -bool get_gquotes(GROUP *g); - -int get_gcount(); - -void group_debug(); //debug function to output all groups - -#endif diff --git a/include/draw.h b/include/draw.h new file mode 100644 index 0000000..275b8bb --- /dev/null +++ b/include/draw.h @@ -0,0 +1,15 @@ +#ifndef DRAW_H +#define DRAW_H + +//These functions are needed by either unix/draw.c or windows/draw.c and must be supplied via a header file + +#define BUF_LEN 1024 + +extern int g_hover; +extern int e_hover; +extern struct group **g; +extern struct entry **e; + +char *get_launch(); + +#endif diff --git a/include/draw_extend.h b/include/draw_extend.h new file mode 100644 index 0000000..6876512 --- /dev/null +++ b/include/draw_extend.h @@ -0,0 +1,6 @@ +#ifndef DRAW_EXTEND_H +#define DRAW_EXTEND_H + +void launch(); + +#endif diff --git a/include/entry.h b/include/entry.h new file mode 100644 index 0000000..51e43ca --- /dev/null +++ b/include/entry.h @@ -0,0 +1,28 @@ +#ifndef ENTRY_H +#define ENTRY_H + +typedef struct entry ENTRY; + +ENTRY *create_entry(char *new_name, char *new_path, bool force); + +void entry_rm(ENTRY *e, ENTRY *prev); + +void clear_entries(ENTRY *head); + +int entry_add(ENTRY *head, ENTRY *tail, ENTRY *add); + +ENTRY **get_entries(ENTRY *head, int count); + +char *get_ename(ENTRY *e); + +char *get_epath(ENTRY *e); + +bool get_eforce(ENTRY *e); + +void set_hide(ENTRY *e, bool status); + +bool get_hide(ENTRY *e); + +void entry_debug(ENTRY *trav); + +#endif diff --git a/include/group.h b/include/group.h new file mode 100644 index 0000000..ab6f409 --- /dev/null +++ b/include/group.h @@ -0,0 +1,40 @@ +#ifndef GROUP_H +#define GROUP_H + +typedef struct group GROUP; + +GROUP *create_group(char *new_name); + +void group_add(char *gname, ENTRY *addme); + +void group_rm(GROUP *g); + +void clean_groups(); //remove empty groups from linked list + +GROUP **get_groups(); + +char *get_gname(GROUP *g); + +char *get_gprog(GROUP *g); + +void set_gprog(GROUP *g, char *p); + +char *get_gflags(GROUP *g); + +void set_gflags(GROUP *g, char *p); + +ENTRY *get_ghead(GROUP *g); + +int get_ecount(GROUP *g); + +void set_ecount(GROUP *g, int new_count); //for use in hiding entries + +void set_gquotes(GROUP *g, bool b); + +bool get_gquotes(GROUP *g); + +int get_gcount(); + +void group_debug(); //debug function to output all groups + +#endif diff --git a/include/read_cfg.h b/include/read_cfg.h new file mode 100644 index 0000000..abb31cc --- /dev/null +++ b/include/read_cfg.h @@ -0,0 +1,26 @@ +#ifndef READ_CFG_H +#define READ_CFG_H + +#define BUF_LEN 1024 + +void cfg_interp(char *path); + +bool get_sort(); + +bool get_case_sensitivity(); + +void refer_to_doc(); + +void addme(char *path, char *group, bool force, char *name); + +int search_ch(char *str, char c); + +int search_last_ch(char *str, char c); + +int wild_cmp(char *wild, char *literal); + +char *strip_quotes(char *str); + +void error_mes(int ln, char *message); + +#endif diff --git a/include/read_cfg_extend.h b/include/read_cfg_extend.h new file mode 100644 index 0000000..3c9cb24 --- /dev/null +++ b/include/read_cfg_extend.h @@ -0,0 +1,12 @@ +#ifndef READ_CFG_EXTEND_H +#define READ_CFG_EXTEND_H + +extern char sep; + +char *find_config(); + +void mkconfig_wizard(); + +void handle_fname(char *path, char *group, bool recurs, bool force, char *name, int ln); + +#endif diff --git a/read_cfg.c b/read_cfg.c index 78df6a4..0213800 100644 --- a/read_cfg.c +++ b/read_cfg.c @@ -4,15 +4,18 @@ #include #include +/* #if defined _WIN32 || defined _WIN64 #include "windows/read_cfg.h" #else #include "unix/read_cfg.h" #endif +*/ -#include "entry.h" -#include "group.h" -#include "read_cfg.h" +#include "include/entry.h" +#include "include/group.h" +#include "include/read_cfg.h" +#include "include/read_cfg_extend.h" #define MAX_ARGS 5 #define OPTION_CNT 14 diff --git a/read_cfg.h b/read_cfg.h deleted file mode 100644 index abb31cc..0000000 --- a/read_cfg.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef READ_CFG_H -#define READ_CFG_H - -#define BUF_LEN 1024 - -void cfg_interp(char *path); - -bool get_sort(); - -bool get_case_sensitivity(); - -void refer_to_doc(); - -void addme(char *path, char *group, bool force, char *name); - -int search_ch(char *str, char c); - -int search_last_ch(char *str, char c); - -int wild_cmp(char *wild, char *literal); - -char *strip_quotes(char *str); - -void error_mes(int ln, char *message); - -#endif diff --git a/unix/draw.c b/unix/draw.c index b35b695..1037b4e 100644 --- a/unix/draw.c +++ b/unix/draw.c @@ -1,8 +1,9 @@ +#include #include #include -#include "../draw.h" -#include "draw.h" +#include "../include/draw.h" +#include "../include/draw_extend.h" void launch(){ char full_command[BUF_LEN]; diff --git a/unix/draw.h b/unix/draw.h deleted file mode 100644 index b8e1c24..0000000 --- a/unix/draw.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef UNIX_DRAW_H -#define UNIX_DRAW_H - -void launch(); - -#endif diff --git a/unix/read_cfg.c b/unix/read_cfg.c index fab91b4..b7fe45b 100644 --- a/unix/read_cfg.c +++ b/unix/read_cfg.c @@ -8,9 +8,9 @@ #include #include -#include "../read_cfg.h" -#include "../entry.h" -#include "read_cfg.h" +#include "../include/read_cfg.h" +#include "../include/entry.h" +#include "../include/read_cfg_extend.h" char sep = '/'; diff --git a/unix/read_cfg.h b/unix/read_cfg.h deleted file mode 100644 index 029cb05..0000000 --- a/unix/read_cfg.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef UNIX_READ_CFG_H -#define UNIX_READ_CFG_H - -extern char sep; - -char *find_config(); - -void mkconfig_wizard(); - -void handle_fname(char *path, char *group, bool recurs, bool force, char *name, int ln); - -#endif diff --git a/windows/draw.c b/windows/draw.c index dd13cc8..b264a6b 100644 --- a/windows/draw.c +++ b/windows/draw.c @@ -1,10 +1,11 @@ +#include #include #include -#include "../draw.h" -#include "../entry.h" -#include "../group.h" -#include "draw.h" +#include "../include/draw.h" +#include "../include/draw_extend.h" +#include "../include/entry.h" +#include "../include/group.h" void launch(){ char *program = get_gprog(g[g_hover]); diff --git a/windows/draw.h b/windows/draw.h deleted file mode 100644 index acde6ee..0000000 --- a/windows/draw.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef WINDOWS_DRAW_H -#define WINDOWS_DRAW_H - -void launch(); - -#endif diff --git a/windows/read_cfg.c b/windows/read_cfg.c index 88f190f..70e4515 100644 --- a/windows/read_cfg.c +++ b/windows/read_cfg.c @@ -8,9 +8,9 @@ #include #include -#include "../read_cfg.h" -#include "../entry.h" -#include "read_cfg.h" +#include "../include/entry.h" +#include "../include/read_cfg.h" +#include "../include/read_cfg_extend.h" char sep = '\\'; diff --git a/windows/read_cfg.h b/windows/read_cfg.h deleted file mode 100644 index 19df23e..0000000 --- a/windows/read_cfg.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef WINDOWS_READ_CFG_H -#define WINDOWS_READ_CFG_H - -extern char sep; - -char *find_config(); - -void mkconfig_wizard(); - -void handle_fname(char *path, char *group, bool recurs, bool force, char *name, int ln); - -#endif -- cgit