diff --git a/GNUmakefile b/GNUmakefile index 72afaef..abc2db2 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -227,14 +227,14 @@ plugin_auth_sqlite_SOURCES := src/plugins/mod_auth_sqlite.c plugin_auth_sqlite_TARGET := mod_auth_sqlite.so plugin_auth_sqlite_LIBS := -lsqlite3 -plugin_chat_history_SOURCE := src/plugins/mod_chat_history.c -plugin_chat_history_TARGET := mod_chat_history.so +plugin_chat_history_SOURCES := src/plugins/mod_chat_history.c +plugin_chat_history_TARGET := mod_chat_history.so -plugin_chat_only_SOURCE := src/plugins/mod_chat_only.c -plugin_chat_only_TARGET := mod_chat_only.so +plugin_chat_only_SOURCES := src/plugins/mod_chat_only.c +plugin_chat_only_TARGET := mod_chat_only.so plugin_topic_SOURCES := src/plugins/mod_topic.c -plugin_topic_TARGET := mod_topic.so +plugin_topic_TARGET := mod_topic.so # Source to objects libuhub_OBJECTS := $(libuhub_SOURCES:.c=.o) @@ -247,9 +247,27 @@ uhub-passwd_OBJECTS := $(uhub-passwd_SOURCES:.c=.o) adcrush_OBJECTS := $(adcrush_SOURCES:.c=.o) admin_OBJECTS := $(admin_SOURCES:.c=.o) -all_plugins := $(plugin_example_TARGET) $(plugin_logging_TARGET) $(plugin_auth_TARGET) $(plugin_auth_sqlite_TARGET) $(plugin_welcome_TARGET) $(plugin_chat_history_TARGET) $(plugin_chat_only_TARGET) $(plugin_topic_TARGET) -all_OBJECTS := $(libuhub_OBJECTS) $(uhub_OBJECTS) $(libutils_OBJECTS) $(adcrush_OBJECTS) $(autotest_OBJECTS) $(admin_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS) -all_OBJECTS += $(all_plugins) +all_plugins := \ + $(plugin_example_TARGET) \ + $(plugin_logging_TARGET) \ + $(plugin_auth_TARGET) \ + $(plugin_auth_sqlite_TARGET) \ + $(plugin_welcome_TARGET) \ + $(plugin_chat_history_TARGET) \ + $(plugin_chat_only_TARGET) \ + $(plugin_topic_TARGET) + +all_OBJECTS := \ + $(libuhub_OBJECTS) \ + $(uhub_OBJECTS) \ + $(libutils_OBJECTS) \ + $(adcrush_OBJECTS) \ + $(autotest_OBJECTS) \ + $(admin_OBJECTS) \ + $(libadc_common_OBJECTS) \ + $(libadc_client_OBJECTS) + +all_OBJECTS += $(all_plugins) uhub_BINARY=uhub$(BIN_EXT) uhub-passwd_BINARY=uhub-passwd$(BIN_EXT) @@ -284,10 +302,10 @@ $(plugin_example_TARGET): $(plugin_example_SOURCES) $(libutils_OBJECTS) $(plugin_logging_TARGET): $(plugin_logging_SOURCES) $(libutils_OBJECTS) $(libadc_common_OBJECTS) src/network/network.o $(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS) -$(plugin_chat_history_TARGET): $(plugin_chat_history_SOURCE) $(libutils_OBJECTS) +$(plugin_chat_history_TARGET): $(plugin_chat_history_SOURCES) $(libutils_OBJECTS) $(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS) -$(plugin_chat_only_TARGET): $(plugin_chat_only_SOURCE) $(libutils_OBJECTS) +$(plugin_chat_only_TARGET): $(plugin_chat_only_SOURCES) $(libutils_OBJECTS) $(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS) $(plugin_welcome_TARGET): $(plugin_welcome_SOURCES) $(libutils_OBJECTS) @@ -344,8 +362,8 @@ install: all @cp $(uhub-passwd_BINARY) $(UHUB_PREFIX)/bin/ @if [ ! -d $(UHUB_CONF_DIR) ]; then echo Creating $(UHUB_CONF_DIR); mkdir -p $(UHUB_CONF_DIR); fi @if [ ! -f $(UHUB_CONF_DIR)/uhub.conf ]; then cp doc/uhub.conf $(UHUB_CONF_DIR); fi - @if [ ! -f $(UHUB_CONF_DIR)/rules.txt ]; then cp doc/rules.txt $(UHUB_CONF_DIR); fi - @if [ ! -f $(UHUB_CONF_DIR)/plugins.conf ]; then cp doc/plugins.conf $(UHUB_CONF_DIR); fi + @if [ ! -f $(UHUB_CONF_DIR)/rules.txt ]; then cp doc/rules.txt $(UHUB_CONF_DIR); fi + @if [ ! -f $(UHUB_CONF_DIR)/plugins.conf ]; then cp doc/plugins.conf $(UHUB_CONF_DIR); fi @if [ ! -d $(UHUB_MOD_DIR) ]; then echo Creating $(UHUB_MOD_DIR); mkdir -p $(UHUB_MOD_DIR); fi @cp -f mod_*.so $(UHUB_MOD_DIR) @touch $(UHUB_CONF_DIR)/motd.txt diff --git a/src/core/user.h b/src/core/user.h index 96d399c..7b7d0b8 100644 --- a/src/core/user.h +++ b/src/core/user.h @@ -109,7 +109,7 @@ struct hub_user struct hub_user_info id; /** Contains nick name and CID */ enum auth_credentials credentials; /** see enum user_credentials */ enum user_state state; /** see enum user_state */ - uint32_t flags; /** see enum user_features */ + uint32_t flags; /** see enum user_flags */ struct linked_list* feature_cast; /** Features supported by feature cast */ struct adc_message* info; /** ADC 'INF' message (broadcasted to everyone joining the hub) */ struct hub_info* hub; /** The hub instance this user belong to */ diff --git a/src/plugin_api/handle.h b/src/plugin_api/handle.h index 2baeeee..5151d3a 100644 --- a/src/plugin_api/handle.h +++ b/src/plugin_api/handle.h @@ -119,9 +119,9 @@ typedef size_t (*hfunc_command_arg_reset)(struct plugin_handle*, struct plugin_c typedef struct plugin_command_arg_data* (*hfunc_command_arg_next)(struct plugin_handle*, struct plugin_command*, enum plugin_command_arg_type); typedef char* (*hfunc_get_hub_name)(struct plugin_handle*); +typedef void (*hfunc_set_hub_name)(struct plugin_handle*, const char*); typedef char* (*hfunc_get_hub_description)(struct plugin_handle*); -typedef void (*hfunc_set_hub_name)(struct plugin_handle*, const char*); -typedef void (*hfunc_set_hub_description)(struct plugin_handle*, const char*); +typedef void (*hfunc_set_hub_description)(struct plugin_handle*, const char*); /** * These are functions created and initialized by the hub and which can be used @@ -137,8 +137,8 @@ struct plugin_hub_funcs hfunc_command_arg_reset command_arg_reset; hfunc_command_arg_next command_arg_next; hfunc_get_hub_name get_name; - hfunc_get_hub_description get_description; hfunc_set_hub_name set_name; + hfunc_get_hub_description get_description; hfunc_set_hub_description set_description; }; diff --git a/src/util/config_token.c b/src/util/config_token.c index d958dd6..705b79c 100644 --- a/src/util/config_token.c +++ b/src/util/config_token.c @@ -73,10 +73,10 @@ struct cfg_tokens* cfg_tokenize(const char* line) } break; - case '\"': + case '"': if (backslash) { - ADD_CHAR('\"'); + ADD_CHAR('"'); backslash = 0; } else if (quote) diff --git a/src/util/misc.c b/src/util/misc.c index e5e90a9..3d6992c 100644 --- a/src/util/misc.c +++ b/src/util/misc.c @@ -258,7 +258,7 @@ int file_read_lines(const char* file, void* data, file_line_handler_t handler) return 0; } - /* Parse configuaration */ + /* Parse configuration */ split_data.handler = handler; split_data.data = data;