From 5600b287a53f4bbb0b6e2953e1bf843216900638 Mon Sep 17 00:00:00 2001 From: Anthony Merlino Date: Tue, 19 Dec 2017 17:15:45 +0000 Subject: [PATCH] Merged in antmerlino/apps/setlogmask (pull request #127) Adds 'setlogmask' application that allows you to set the syslog priority via a simple command Approved-by: Gregory Nutt --- system/setlogmask/.gitignore | 11 +++ system/setlogmask/Kconfig | 30 +++++++ system/setlogmask/Make.defs | 40 +++++++++ system/setlogmask/Makefile | 147 ++++++++++++++++++++++++++++++++ system/setlogmask/setlogmask.c | 149 +++++++++++++++++++++++++++++++++ 5 files changed, 377 insertions(+) create mode 100644 system/setlogmask/.gitignore create mode 100644 system/setlogmask/Kconfig create mode 100644 system/setlogmask/Make.defs create mode 100644 system/setlogmask/Makefile create mode 100644 system/setlogmask/setlogmask.c diff --git a/system/setlogmask/.gitignore b/system/setlogmask/.gitignore new file mode 100644 index 000000000..83bd7b811 --- /dev/null +++ b/system/setlogmask/.gitignore @@ -0,0 +1,11 @@ +/Make.dep +/.depend +/.built +/*.asm +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src +/*.obj diff --git a/system/setlogmask/Kconfig b/system/setlogmask/Kconfig new file mode 100644 index 000000000..f828c5a1f --- /dev/null +++ b/system/setlogmask/Kconfig @@ -0,0 +1,30 @@ +# +# For a description of the syntax of this configuration file, +# see the file kconfig-language.txt in the NuttX tools repository. +# + +config SYSTEM_SETLOGMASK + bool "'setlogmask' command" + default n + ---help--- + Enable support for 'setlogmask' command used to set syslog level. + +if SYSTEM_SETLOGMASK +config SYSTEM_SETLOGMASK_PROGNAME + string "setlogmask program name" + default "setlogmask" + depends on BUILD_KERNEL + ---help--- + This is the name of the program that will be use when the NSH ELF + program is installed. + +config SYSTEM_SETLOGMASK_PRIORITY + int "setlogmask task priority" + default 100 + +config SYSTEM_SET_LOGMASK_STACKSIZE + int "setlogmask stack size" + default 2048 + +endif + diff --git a/system/setlogmask/Make.defs b/system/setlogmask/Make.defs new file mode 100644 index 000000000..075afeb87 --- /dev/null +++ b/system/setlogmask/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/setlogmask/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2017 Verge Inc. All rights reserved. +# Author: Anthony Merlino +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. 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. +# 3. Neither the name NuttX 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "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 THE +# COPYRIGHT OWNER OR CONTRIBUTORS 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. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_SETLOGMASK),y) +CONFIGURED_APPS += system/setlogmask +endif + diff --git a/system/setlogmask/Makefile b/system/setlogmask/Makefile new file mode 100644 index 000000000..db6a8464d --- /dev/null +++ b/system/setlogmask/Makefile @@ -0,0 +1,147 @@ +############################################################################ +# apps/system/setlogmask/Makefile +# +# Copyright (C) 2017 Verge Inc. All rights reserved. +# Author: Anthony Merlino +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. 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. +# 3. Neither the name NuttX 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "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 THE +# COPYRIGHT OWNER OR CONTRIBUTORS 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. +# +############################################################################ + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs +include $(APPDIR)/Make.defs + +# setlogmask command + +CONFIG_SYSTEM_SETLOGMASK_PRIORITY ?= SCHED_PRIORITY_DEFAULT +CONFIG_SYSTEM_SETLOGMASK_STACKSIZE ?= 2048 + +APPNAME = setlogmask +PRIORITY = $(CONFIG_SYSTEM_SETLOGMASK_PRIORITY) +STACKSIZE = $(CONFIG_SYSTEM_SETLOGMASK_STACKSIZE) + +CONFIG_SYSTEM_SETLOGMASK_PROGNAME ?= setlogmask$(EXEEXT) +PROGNAME = $(CONFIG_SYSTEM_SETLOGMASK_PROGNAME) + +# Files + +ASRCS = +CSRCS = +MAINSRC = setlogmask.c + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) +MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) +OBJS = $(AOBJS) $(COBJS) + +ifneq ($(CONFIG_BUILD_KERNEL),y) + OBJS += $(MAINOBJ) +endif + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + BIN = ..\..\libapps$(LIBEXT) +else +ifeq ($(WINTOOL),y) + BIN = ..\\..\\libapps$(LIBEXT) +else + BIN = ../../libapps$(LIBEXT) +endif +endif + +ifeq ($(WINTOOL),y) + INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}" +else + INSTALL_DIR = $(BIN_DIR) +endif + +ROOTDEPPATH = --dep-path . + +# Common build + +VPATH = + +all: .built +.PHONY: context depend clean distclean preconfig +.PRECIOUS: ../../libapps$(LIBEXT) + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +.built: $(OBJS) + $(call ARCHIVE, $(BIN), $(OBJS)) + $(Q) touch .built + +ifeq ($(CONFIG_BUILD_KERNEL),y) +$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) + @echo "LD: $(PROGNAME)" + $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) + $(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(PROGNAME) + +install: $(BIN_DIR)$(DELIM)$(PROGNAME) + +else +install: + +endif + +# Register application + +ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: +endif + +# Create dependencies + +.depend: Makefile $(SRCS) + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ + +depend: .depend + +clean: + $(call DELFILE, .built) + $(call CLEAN) + +distclean: clean + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) + +preconfig: + +-include Make.dep diff --git a/system/setlogmask/setlogmask.c b/system/setlogmask/setlogmask.c new file mode 100644 index 000000000..38d0b93ef --- /dev/null +++ b/system/setlogmask/setlogmask.c @@ -0,0 +1,149 @@ +/**************************************************************************** + * apps/system/setlogmask/setlogmask.c + * + * Copyright (C) 2017 Verge Inc. All rights reserved. + * Author: Anthony Merlino + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name NuttX 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "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 THE + * COPYRIGHT OWNER OR CONTRIBUTORS 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include +#include + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: show_usage + ****************************************************************************/ + +static void show_usage(FAR const char *progname, int exitcode) noreturn_function; +static void show_usage(FAR const char *progname, int exitcode) +{ + printf("\nUsage: %s \n", progname); + printf(" %s -h\n", progname); + printf("\nWhere:\n"); + printf(" d=DEBUG\n"); + printf(" i=INFO\n"); + printf(" n=NOTICE\n"); + printf(" w=WARNING\n"); + printf(" e=ERROR\n"); + printf(" c=CRITICAL\n"); + printf(" a=ALERT\n"); + printf(" r=EMERG\n"); + exit(exitcode); +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +#ifdef CONFIG_BUILD_KERNEL +int main(int argc, FAR char *argv[]) +#else +int setlogmask_main(int argc, char **argv) +#endif +{ + if (argc < 2) + { + show_usage(argv[0], EXIT_FAILURE); + } + + switch (*argv[1]) + { + case 'd': + { + setlogmask(LOG_UPTO(LOG_DEBUG)); + } + break; + case 'i': + { + setlogmask(LOG_UPTO(LOG_INFO)); + } + break; + case 'n': + { + setlogmask(LOG_UPTO(LOG_NOTICE)); + } + break; + case 'w': + { + setlogmask(LOG_UPTO(LOG_WARNING)); + } + break; + case 'e': + { + setlogmask(LOG_UPTO(LOG_ERR)); + } + break; + case 'c': + { + setlogmask(LOG_UPTO(LOG_CRIT)); + } + break; + case 'a': + { + setlogmask(LOG_UPTO(LOG_ALERT)); + } + break; + case 'r': + { + setlogmask(LOG_UPTO(LOG_EMERG)); + } + break; + default: + { + show_usage(argv[0], EXIT_FAILURE); + } + break; + } + + return EXIT_SUCCESS; +}