# HG changeset patch # User ethanzonca@CL-ENS241-08.cedarville.edu # Date 2013-04-12 15:32:31 # Node ID 44700fd98d2bab7dc76b8955ef7ceba8ee338162 # Parent 88d82c0c283c9f37f5d1e4aa4f61d97f834b82af Initial import of INI parsing module diff --git a/master/master/lib/ini/LICENSE.txt b/master/master/lib/ini/LICENSE.txt new file mode 100644 --- /dev/null +++ b/master/master/lib/ini/LICENSE.txt @@ -0,0 +1,27 @@ + +The "inih" library is distributed under the New BSD license: + +Copyright (c) 2009, Brush Technology +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Brush Technology nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY BRUSH TECHNOLOGY ''AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL BRUSH TECHNOLOGY BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/master/master/lib/ini/README.txt b/master/master/lib/ini/README.txt new file mode 100644 --- /dev/null +++ b/master/master/lib/ini/README.txt @@ -0,0 +1,5 @@ + +inih is a simple .INI file parser written in C, released under the New BSD +license (see LICENSE.txt). Go to the project home page for more info: + +http://code.google.com/p/inih/ diff --git a/master/master/lib/ini/ini.c b/master/master/lib/ini/ini.c new file mode 100644 --- /dev/null +++ b/master/master/lib/ini/ini.c @@ -0,0 +1,173 @@ +/* inih -- simple .INI file parser + +inih is released under the New BSD license (see LICENSE.txt). Go to the project +home page for more info: + +http://code.google.com/p/inih/ + +*/ + +#include +#include +#include + +#include "ini.h" +#include "../logger.h" + +#if !INI_USE_STACK +#include +#endif + +#define MAX_SECTION 50 +#define MAX_NAME 50 + +/* Strip whitespace chars off end of given string, in place. Return s. */ +static char* rstrip(char* s) +{ + char* p = s + strlen(s); + while (p > s && isspace((unsigned char)(*--p))) + *p = '\0'; + return s; +} + +/* Return pointer to first non-whitespace char in given string. */ +static char* lskip(const char* s) +{ + while (*s && isspace((unsigned char)(*s))) + s++; + return (char*)s; +} + +/* Return pointer to first char c or ';' comment in given string, or pointer to + null at end of string if neither found. ';' must be prefixed by a whitespace + character to register as a comment. */ +static char* find_char_or_comment(const char* s, char c) +{ + int was_whitespace = 0; + while (*s && *s != c && !(was_whitespace && *s == ';')) { + was_whitespace = isspace((unsigned char)(*s)); + s++; + } + return (char*)s; +} + +/* Version of strncpy that ensures dest (size bytes) is null-terminated. */ +static char* strncpy0(char* dest, const char* src, size_t size) +{ + strncpy(dest, src, size); + dest[size - 1] = '\0'; + return dest; +} + +/* See documentation in header file. */ +int ini_parse_file(int (*handler)(void*, const char*, const char*, + const char*), + void* user) +{ + + /* Uses a fair bit of stack (use heap instead if you need to) */ +#if INI_USE_STACK + char line[INI_MAX_LINE]; +#else + char* line; +#endif + char section[MAX_SECTION] = ""; + char prev_name[MAX_NAME] = ""; + + char* start; + char* end; + char* name; + char* value; + int lineno = 0; + int error = 0; + +#if !INI_USE_STACK + line = (char*)malloc(INI_MAX_LINE); + if (!line) { + return -2; + } +#endif + + /* Scan through file line by line */ + while (logger_config_fgets(line, INI_MAX_LINE) != NULL) { + lineno++; + + start = line; +#if INI_ALLOW_BOM + if (lineno == 1 && (unsigned char)start[0] == 0xEF && + (unsigned char)start[1] == 0xBB && + (unsigned char)start[2] == 0xBF) { + start += 3; + } +#endif + start = lskip(rstrip(start)); + + if (*start == ';' || *start == '#') { + /* Per Python ConfigParser, allow '#' comments at start of line */ + } +#if INI_ALLOW_MULTILINE + else if (*prev_name && *start && start > line) { + /* Non-black line with leading whitespace, treat as continuation + of previous name's value (as per Python ConfigParser). */ + if (!handler(user, section, prev_name, start) && !error) + error = lineno; + } +#endif + else if (*start == '[') { + /* A "[section]" line */ + end = find_char_or_comment(start + 1, ']'); + if (*end == ']') { + *end = '\0'; + strncpy0(section, start + 1, sizeof(section)); + *prev_name = '\0'; + } + else if (!error) { + /* No ']' found on section line */ + error = lineno; + } + } + else if (*start && *start != ';') { + /* Not a comment, must be a name[=:]value pair */ + end = find_char_or_comment(start, '='); + if (*end != '=') { + end = find_char_or_comment(start, ':'); + } + if (*end == '=' || *end == ':') { + *end = '\0'; + name = rstrip(start); + value = lskip(end + 1); + end = find_char_or_comment(value, '\0'); + if (*end == ';') + *end = '\0'; + rstrip(value); + + /* Valid name[=:]value pair found, call handler */ + strncpy0(prev_name, name, sizeof(prev_name)); + if (!handler(user, section, name, value) && !error) + error = lineno; + } + else if (!error) { + /* No '=' or ':' found on name[=:]value line */ + error = lineno; + } + } + } + +#if !INI_USE_STACK + free(line); +#endif + + return error; +} + +/* See documentation in header file. */ +int ini_parse(int (*handler)(void*, const char*, const char*, const char*), + void* user) +{ + int error; + if (!logger_getconfigfd()) + return -1; + error = ini_parse_file(handler, user); + logger_closeconffd(); + return error; +} diff --git a/master/master/lib/ini/ini.h b/master/master/lib/ini/ini.h new file mode 100644 --- /dev/null +++ b/master/master/lib/ini/ini.h @@ -0,0 +1,67 @@ +/* inih -- simple .INI file parser + +inih is released under the New BSD license (see LICENSE.txt). Go to the project +home page for more info: + +http://code.google.com/p/inih/ + +*/ + +#ifndef __INI_H__ +#define __INI_H__ + +/* Make this header file easier to include in C++ code */ +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/* Parse given INI-style file. May have [section]s, name=value pairs + (whitespace stripped), and comments starting with ';' (semicolon). Section + is "" if name=value pair parsed before any section heading. name:value + pairs are also supported as a concession to Python's ConfigParser. + + For each name=value pair parsed, call handler function with given user + pointer as well as section, name, and value (data only valid for duration + of handler call). Handler should return nonzero on success, zero on error. + + Returns 0 on success, line number of first error on parse error (doesn't + stop on first error), -1 on file open error, or -2 on memory allocation + error (only when INI_USE_STACK is zero). +*/ +int ini_parse_file(int (*handler)(void*, const char*, const char*, + const char*), + void* user); + +int ini_parse(int (*handler)(void*, const char*, const char*, const char*), + void* user); + +/* Nonzero to allow multi-line value parsing, in the style of Python's + ConfigParser. If allowed, ini_parse() will call the handler with the same + name for each subsequent line parsed. */ +#ifndef INI_ALLOW_MULTILINE +#define INI_ALLOW_MULTILINE 1 +#endif + +/* Nonzero to allow a UTF-8 BOM sequence (0xEF 0xBB 0xBF) at the start of + the file. See http://code.google.com/p/inih/issues/detail?id=21 */ +#ifndef INI_ALLOW_BOM +#define INI_ALLOW_BOM 1 +#endif + +/* Nonzero to use stack, zero to use heap (malloc/free). */ +#ifndef INI_USE_STACK +#define INI_USE_STACK 1 +#endif + +/* Maximum line length for any line in INI file. */ +#ifndef INI_MAX_LINE +#define INI_MAX_LINE 25 +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* __INI_H__ */ diff --git a/master/master/lib/iniparse.c b/master/master/lib/iniparse.c new file mode 100644 --- /dev/null +++ b/master/master/lib/iniparse.c @@ -0,0 +1,118 @@ +/* + * Master Firmware: INI Parser + * + * Wireless Observational Modular Aerial Network + * + * Ethan Zonca + * Matthew Kanning + * Kyle Ripperger + * Matthew Kroening + * + */ + +#include "../config.h" +#include +#include +#include +#include "iniparse.h" +#include "ini/ini.h" +#include "logger.h" + +static int handler(void* user, const char* section, const char* name, const char* value) +{ + + configuration* pconfig = (configuration*)user; + + #define MATCH(s, n) strcmp(section, s) == 0 && strcmp(name, n) == 0 + + if (MATCH("general", "temp")) { + pconfig->heater_threshold = atoi(value); + + + } else if (MATCH("general", "reqrate")) { + pconfig->datarequest_rate = strtol(value, NULL, 10); + + + } else if (MATCH("blackout", "enable")) { + pconfig->blackout_enable = strncmp(value, "false", 4); + + + } else if (MATCH("blackout", "timeout")) { + pconfig->blackout_timeout = strtol(value, NULL, 10); + + + } else if (MATCH("buzzer", "failsafe")) { + pconfig->buzzer_failsafe_duration = strtol(value, NULL, 10); + + + } else if (MATCH("buzzer", "mintime")) { + pconfig->buzzer_trigger_minduration = strtol(value, NULL, 10); + + } else if (MATCH("buzzer", "maxalt")) { + pconfig->buzzer_trigger_maxaltitude = strtol(value, NULL, 10); + + } else if (MATCH("aprs", "call")) { + strncpy(pconfig->s_callsign, value, 10); + //pconfig->s_callsign = strdup(value); + + + } else if (MATCH("aprs", "call_id")) { + pconfig->s_callsign_id = atoi(value); + + + } else if (MATCH("aprs", "period")) { + pconfig->aprs_transmit_period = strtol(value, NULL, 10); + + } else { + error_log_msg(ERROR_CONFIGPARSE,false,"bad entry"); + return 0; /* unknown section/name, error */ + } + + + return 1; +} + +configuration config = { + #ifdef BLACKOUT_ENABLE + .blackout_enable = true, + #else + .blackout_enable = false, + #endif + + .blackout_timeout = BLACKOUT_TIMEOUT, + .heater_threshold = HEATER_THRESHOLD, + .buzzer_failsafe_duration = BUZZER_FAILSAFE_DURATION, + .buzzer_trigger_minduration = BUZZER_TRIGGER_MINDURATION, + .buzzer_trigger_maxaltitude = BUZZER_TRIGGER_MAXALTITUDE, + .datarequest_rate = DATAREQUEST_RATE, + .s_callsign = S_CALLSIGN, + .s_callsign_id = S_CALLSIGN_ID, + .aprs_transmit_period = APRS_TRANSMIT_PERIOD +}; + +void iniparse_getconfig() +{ + // Init configuration with default values from config.h + + if (ini_parse(handler, &config) < 0) { + // ERROR: Make new error code here! + error_log(ERROR_CONFIGPARSE, false); + } + + sysconfig = &config; + + // Print configuration to err + error_log_rawwrite("\nConf:\n"); + + char msg[50]; + snprintf(msg, 50,"reqrate: %lu\n",sysconfig->datarequest_rate); + error_log_rawwrite(msg); + snprintf(msg, 50,"call: %s\n",sysconfig->s_callsign); + error_log_rawwrite(msg); + snprintf(msg, 50,"callID: %u\n",sysconfig->s_callsign_id); + error_log_rawwrite(msg); + snprintf(msg, 50,"aprsperiod: %lu\n\n",sysconfig->aprs_transmit_period); + error_log_rawwrite(msg); + + return; +} \ No newline at end of file diff --git a/master/master/lib/iniparse.h b/master/master/lib/iniparse.h new file mode 100644 --- /dev/null +++ b/master/master/lib/iniparse.h @@ -0,0 +1,20 @@ +/* + * Master Firmware: INI Parser + * + * Wireless Observational Modular Aerial Network + * + * Ethan Zonca + * Matthew Kanning + * Kyle Ripperger + * Matthew Kroening + * + */ + + +#ifndef INIPARSE_H_ +#define INIPARSE_H_ + + + + +#endif /* INIPARSE_H_ */ \ No newline at end of file