sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add logic to support an NSH-specific system command

Browse Source
This commit is contained in:
Gregory Nutt 2016-08-25 11:31:08 -06:00
parent 1ea82fe8fa
commit e39cfc97c7
5 changed files with 120 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/nshlib/nshlib.h
View File

@ -201,6 +201,27 @@ void platform_motd(FAR char *buffer, size_t buflen);
int platform_user_verify(FAR const char *username, FAR const char *password);
#endif
/****************************************************************************
* Name: nsh_system
*
* Description:
* This is the NSH-specific implementation of the standard system()
* command.
*
* NOTE: This assumes that other NSH instances have previously ran and so
* common NSH logic is already initialized.
*
* Input Parameters:
* Standard task start-up arguments. Expects argc == 2 with argv[1] being
* the command to execute
*
* Returned Values:
* EXIT_SUCCESS or EXIT_FAILURE
*
****************************************************************************/
int nsh_system(int argc, char *argv[]);
#undef EXTERN
#ifdef __cplusplus
}

2
nshlib/Makefile
View File

@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs
# NSH Library
ASRCS =
CSRCS = nsh_init.c nsh_parse.c nsh_console.c nsh_script.c
CSRCS = nsh_init.c nsh_parse.c nsh_console.c nsh_script.c nsh_system.c
CSRCS += nsh_command.c nsh_fscmds.c nsh_ddcmd.c nsh_proccmds.c nsh_mmcmds.c
CSRCS += nsh_timcmds.c nsh_envcmds.c nsh_syscmds.c nsh_dbgcmds.c

24
nshlib/nsh_consolemain.c
View File

@ -47,30 +47,6 @@
#if !defined(HAVE_USB_CONSOLE) && !defined(HAVE_USB_KEYBOARD)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/

24
nshlib/nsh_fileapps.c
View File

@ -53,30 +53,6 @@
#ifdef CONFIG_NSH_FILE_APPS
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/

98
nshlib/nsh_system.c Normal file
View File

@ -0,0 +1,98 @@
/****************************************************************************
* apps/nshlib/nsh_system.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* 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 Gregory Nutt 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 <nuttx/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include "nsh.h"
#include "nsh_console.h"
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: nsh_system
*
* Description:
* This is the NSH-specific implementation of the standard system()
* command.
*
* NOTE: This assumes that other NSH instances have previously ran and so
* common NSH logic is already initialized.
*
* Input Parameters:
* Standard task start-up arguments. Expects argc == 2 with argv[1] being
* the command to execute
*
* Returned Values:
* EXIT_SUCCESS or EXIT_FAILURE
*
****************************************************************************/
int nsh_system(int argc, char *argv[])
{
/* Expect argc == 2 with argv[1] being the command to execute */
if (argc >= 2)
{
FAR struct console_stdio_s *pstate = nsh_newconsole();
FAR struct nsh_vtbl_s *vtbl;
DEBUGASSERT(pstate != NULL && pstate->cn_vtbl != NULL);
vtbl = &pstate->cn_vtbl;
/* Parse process the command */
(void)nsh_parse(vtbl, argv[1]);
fflush(pstate->cn_outstream);
/* Exit upon return */
nsh_exit(&pstate->cn_vtbl, OK);
return EXIT_SUCCESS;
}
else
{
return EXIT_FAILURE;
}
}