mirror of
https://github.com/servalproject/serval-dna.git
synced 2024-12-30 01:48:54 +00:00
8325aacc5d
Recent changes such as the Makefile.in overhaul and the introduction of feature-driven linking broke the Android build. This commit fixes the breakage: - detects the presence of gettid() in configure.ac and only defines gettid() in serval.c if HAVE_GETTID is not defined - builds libserval.so not libservald.so on Android, to avoid a conflict on the module name "servald" in Android.mk - renames cli_cleanup() to command_cleanup(), defines it in commandline.h instead of cli.h, and supplies it in android.c - supplies the 'keyring' global in android.c - removes log_stderr.c from the Android build, since it conflicted with log.c
58 lines
2.0 KiB
C
58 lines
2.0 KiB
C
/*
|
|
Serval DNA command-line parsing
|
|
Copyright (C) 2014-2015 Serval Project Inc.
|
|
Copyright (C) 2016 Flinders University
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifndef __SERVAL_DNA__COMMANDLINE_H
|
|
#define __SERVAL_DNA__COMMANDLINE_H
|
|
|
|
#include <stdio.h> // for FILE
|
|
#include "section.h"
|
|
#include "cli.h"
|
|
|
|
#define KEYRING_PIN_OPTION ,"[--keyring-pin=<pin>]"
|
|
#define KEYRING_ENTRY_PIN_OPTION ,"[--entry-pin=<pin>]"
|
|
#define KEYRING_PIN_OPTIONS KEYRING_PIN_OPTION KEYRING_ENTRY_PIN_OPTION "..."
|
|
|
|
// macros are weird sometimes ....
|
|
#define __APPEND_(X,Y) X ## Y
|
|
#define _APPEND(X,Y) __APPEND_(X,Y)
|
|
|
|
#define DEFINE_CMD(FUNC, FLAGS, HELP, WORD1, ...) \
|
|
static int FUNC(const struct cli_parsed *parsed, struct cli_context *context); \
|
|
static struct cli_schema _APPEND(FUNC, __LINE__) IN_SECTION(commands) = {\
|
|
.function = FUNC, \
|
|
.words = {WORD1, ##__VA_ARGS__, NULL}, \
|
|
.flags = FLAGS, \
|
|
.description = HELP \
|
|
}
|
|
|
|
DECLARE_SECTION(struct cli_schema, commands);
|
|
|
|
#define CMD_COUNT (SECTION_START(commands) - SECTION_END(commands))
|
|
|
|
int commandline_main(struct cli_context *context, const char *argv0, int argc, const char *const *args);
|
|
int commandline_main_stdio(FILE *output, const char *argv0, int argc, const char *const *args);
|
|
|
|
/* Called after every command has finished. Is not supplied by the
|
|
* command-line object; the caller must define this function.
|
|
*/
|
|
void command_cleanup();
|
|
|
|
#endif // __SERVAL_DNA__COMMANDLINE_H
|