summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-09-01 00:26:37 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-09-01 00:26:37 +0000
commitc3d47646c26fda666b9ba8482fe71897342058e6 (patch)
tree3bbf2fe893cea2fca70b52e6143fc992fff59686
parent1a3648b2528742218065ddcb89a87848aec0b1da (diff)
Remove CONFIG_LIBC_PERROR_DEVNAME. What was I thinking?
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5074 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-rw-r--r--apps/examples/README.txt12
-rw-r--r--nuttx/ChangeLog2
-rw-r--r--nuttx/Documentation/NuttxPortingGuide.html5
-rw-r--r--nuttx/configs/README.txt3
-rw-r--r--nuttx/lib/stdio/lib_perror.c35
-rwxr-xr-xnuttx/tools/README.txt10
6 files changed, 22 insertions, 45 deletions
diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 7d068f9794..52d7279dac 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -1345,10 +1345,14 @@ examples/uip
file in the configuration driver with instruction to build applications
like:
- CONFIGURED_APPS += uiplib
- CONFIGURED_APPS += dhcpc
- CONFIGURED_APPS += resolv
- CONFIGURED_APPS += webserver
+ CONFIGURED_APPS += uiplib
+ CONFIGURED_APPS += dhcpc
+ CONFIGURED_APPS += resolv
+ CONFIGURED_APPS += webserver
+
+ NOTE: This example does depend on the perl script at
+ nuttx/tools/mkfsdata.pl. You must have perl installed on your
+ development system at /usr/bin/perl.
examples/usbserial
^^^^^^^^^^^^^^^^^^
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index e479b25fce..2e17f8eb1e 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3241,3 +3241,5 @@
files for the STM3240G-EVAL were replaced by one version in this directory.
* configs/stm3240g-eval/webserver: Configuration submitted by Max Holtzberg
for testing the changes to the uIP web server (see apps/ChangeLog.txt).
+ * lib/stdio/lib_perror.c: Remove CONFIG_LIBC_PERROR_DEVNAME. What was I
+ thinking? Arbitrary streams cannot be shared by different tasks.
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index 532da8c16c..9deff7a064 100644
--- a/nuttx/Documentation/NuttxPortingGuide.html
+++ b/nuttx/Documentation/NuttxPortingGuide.html
@@ -4378,11 +4378,6 @@ build
POSIX requires that <code>perror()</code> provide its output on <code>stderr</code>.
This option may be defined, however, to provide <code>perror()</code> output that is serialized with other <code>stdout</code> messages.
</li>
- <li>
- <code>CONFIG_LIBC_PERROR_DEVNAME</code>:
- Another non-standard option is to provide <code>perror()</code> output to a logging device or file.
- <code>CONFIG_LIBC_PERROR_DEVNAME<code> may be defined to be any write-able, character device (or file).
- </li>
</ul>
<h2>Allow for architecture optimized implementations</h2>
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index 4b68d28bdd..dc9d8d88e8 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -573,9 +573,6 @@ defconfig -- This is a configuration file similar to the Linux
CONFIG_LIBC_PERROR_STDOUT - POSIX requires that perror() provide its output
on stderr. This option may be defined, however, to provide perror() output
that is serialized with other stdout messages.
- CONFIG_LIBC_PERROR_DEVNAME - Another non-standard option is to provide
- perror() output to a logging device or file. CONFIG_LIBC_PERROR_DEVNAME
- may be defined to be any write-able, character device (or file).
Allow for architecture optimized implementations
diff --git a/nuttx/lib/stdio/lib_perror.c b/nuttx/lib/stdio/lib_perror.c
index 3be2dd9db9..867e113f98 100644
--- a/nuttx/lib/stdio/lib_perror.c
+++ b/nuttx/lib/stdio/lib_perror.c
@@ -53,18 +53,8 @@
#ifdef CONFIG_LIBC_PERROR_STDOUT
# define PERROR_STREAM stdout
-# undef CONFIG_LIBC_PERROR_DEVNAME
-#endif
-
-/* Another non-standard option is to provide perror output to a logging
- * device or file. CONFIG_LIBC_PERROR_DEVNAME may be defined to be any write-
- * able, character device (or file).
- */
-
-#ifndef CONFIG_LIBC_PERROR_DEVNAME
-# define PERROR_STREAM stderr
#else
-# define PERROR_STREAM perror_stream;
+# define PERROR_STREAM stderr
#endif
/****************************************************************************
@@ -83,10 +73,6 @@
* Private Data
****************************************************************************/
-#ifdef CONFIG_LIBC_PERROR_DEVNAME
-static FILE *perror_stream;
-#endif
-
/****************************************************************************
* Private Functions
****************************************************************************/
@@ -101,24 +87,6 @@ static FILE *perror_stream;
void perror(FAR const char *s)
{
- /* If we are using a custom output device (something other than
- * /dev/console), then make sure that the device has been opened.
- */
-
-#ifdef CONFIG_LIBC_PERROR_DEVNAME
- if (!perror_stream)
- {
- /* Not yet.. open it now */
-
- perror_stream = fopen(CONFIG_LIBC_PERROR_DEVNAME, "w");
- if (!perror_stream)
- {
- /* Oops... we couldn't open the device */
-
- return;
- }
- }
-#endif
/* If strerror() is not enabled, then just print the error number */
@@ -128,3 +96,4 @@ void perror(FAR const char *s)
(void)fprintf(PERROR_STREAM, "%s: Error %d\n", s, errno);
#endif
}
+
diff --git a/nuttx/tools/README.txt b/nuttx/tools/README.txt
index 39128fa1b0..2a3416adb7 100755
--- a/nuttx/tools/README.txt
+++ b/nuttx/tools/README.txt
@@ -44,6 +44,16 @@ mkexport.sh and Makefile.export
Makefile.export is used only by the mkexport.sh script to parse out
options from the top-level Make.defs file.
+mkfsdata.pl
+
+ This perl script is used to build the "fake" file system and CGI support
+ as needed for the apps/netutils/webserver. It is currently used only
+ by the Makefile at apps/examples/uip. That example serves as an example
+ of how to configure the uIP webserver "fake" file system.
+
+ NOTE: This perl script comes from uIP and was (probably) written
+ by Adam Dunkels. uIP has a license that is compatible with NuttX.
+
mkversion.c, cfgparser.c, and cfgparser.h
This is C file that is used to build mkversion program. The mkversion