Move apps/include/nsh.h to apps/include/nshlib/nshlib.h

examples/cc3000/shell.c

@@ -51,7 +51,7 @@
 #include <apps/netutils/netlib.h>
 
 #include "shell.h"
-#include <apps/nsh.h>
+#include <apps/nshlib/nshlib.h>
 
 /****************************************************************************
  * Pre-processor Definitions

examples/nsh/nsh_main.c

@@ -55,7 +55,7 @@
 #  include <nuttx/binfmt/symtab.h>
 #endif
 
-#include <apps/nsh.h>
+#include <apps/nshlib/nshlib.h>
 
 /****************************************************************************
  * Pre-processor Definitions

examples/nxterm/nxterm_main.c

@@ -66,7 +66,7 @@
 #include <nuttx/nx/nxfonts.h>
 #include <nuttx/nx/nxterm.h>
 
-#include <apps/nsh.h>
+#include <apps/nshlib/nshlib.h>
 
 #include "nxterm_internal.h"
 

include/nshlib/nshlib.h

@@ -1,7 +1,7 @@
 /****************************************************************************
- * apps/include/nsh.h
+ * apps/include/nshlib/nshlib.h
  *
- *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_INCLUDE_NSH_H
-#define __APPS_INCLUDE_NSH_H
+#ifndef __APPS_INCLUDE_NSHLIB_NSHLIB_H
+#define __APPS_INCLUDE_NSHLIB_NSHLIB_H
 
 /****************************************************************************
  * Included Files
@@ -206,4 +206,4 @@ int platform_user_verify(FAR const char *username, FAR const char *password);
 }
 #endif
 
-#endif /* __APPS_INCLUDE_NSH_H */
+#endif /* __APPS_INCLUDE_NSHLIB_NSHLIB_H */

netutils/README.txt

@@ -61,7 +61,7 @@ highly influenced by uIP) include:
               "wrapped" as character devices and mapped to stdin,
               stdout, and stderr.  Now the telnet session can be
               inherited by spawned tasks.
-  ftpc      - FTP client.  See apps/include/ftpc.h for interface
+  ftpc      - FTP client.  See apps/include/netutils/ftpc.h for interface
               information.
   ftpd      - FTP server.   See apps/include/netutils/ftpd.h for interface
               information.

netutils/ftpd/ftpd.h

@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/include/ftpd.h
+ * apps/netutils/ftpd/ftpd.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

nshlib/Kconfig

@@ -43,10 +43,10 @@ config NSH_PLATFORM_MOTD
 
 		One newline will be inserted after the platform-supplied message.
 
-		platform_motd() is prototyped and described in apps/include/nsh.h
+		platform_motd() is prototyped and described in apps/include/nshlib/nshlib.h
 		which may be included like:
 
-			#include <apps/nsh.h>
+			#include <apps/nshlib/nshlib.h>
 
 config NSH_MOTD_STRING
 	string "MOTD String"
@@ -1538,10 +1538,10 @@ config NSH_LOGIN_PLATFORM
 
 			int platform_user_verify(FAR const char *username, FAR const char *password);
 
-		which is prototyped an described in apps/include/nsh.h and which may
-		be included like:
+		which is prototyped an described in apps/include/nshlib/nshlib.h and
+		which may be included like:
 
-			#include <apps/nsh.h>
+			#include <apps/nshlib/nshlib.h>
 
 		An appropriate place to implement this function might be in the
 		directory apps/platform/<board>.

nshlib/nsh_init.c

@@ -42,7 +42,7 @@
 #include <sys/boardctl.h>
 
 #include <apps/system/readline.h>
-#include <apps/nsh.h>
+#include <apps/nshlib/nshlib.h>
 
 #include "nsh.h"
 

nshlib/nsh_parse.c

@@ -50,7 +50,7 @@
 #endif
 
 #include <nuttx/version.h>
-#include <apps/nsh.h>
+#include <apps/nshlib/nshlib.h>
 
 #include "nsh.h"
 #include "nsh_console.h"