summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-03-31 15:13:12 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-03-31 15:13:12 +0000
commita4e8ceb39fe53a6e0a6822e4aaf7cac7b306bcdd (patch)
tree98e0f474d93010b7655ad4b7528df65b3874537f /apps
parent466b008cb51f1c4efe9c8914df35d42ac85d7eba (diff)
Fix read() return value for the case of permissions problem
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4545 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'apps')
-rw-r--r--apps/nshlib/nsh_consolemain.c3
-rw-r--r--apps/nshlib/nsh_telnetd.c3
-rw-r--r--apps/system/readline/readline.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/apps/nshlib/nsh_consolemain.c b/apps/nshlib/nsh_consolemain.c
index 36ffdab8f0..a6e28c051e 100644
--- a/apps/nshlib/nsh_consolemain.c
+++ b/apps/nshlib/nsh_consolemain.c
@@ -149,7 +149,8 @@ int nsh_consolemain(int argc, char *argv[])
else
{
- fprintf(pstate->cn_outstream, g_fmtcmdfailed, "readline", NSH_ERRNO_OF(-ret));
+ fprintf(pstate->cn_outstream, g_fmtcmdfailed, "nsh_consolemain",
+ "readline", NSH_ERRNO_OF(-ret));
nsh_exit(&pstate->cn_vtbl, 1);
}
}
diff --git a/apps/nshlib/nsh_telnetd.c b/apps/nshlib/nsh_telnetd.c
index 66923deb23..0117aad042 100644
--- a/apps/nshlib/nsh_telnetd.c
+++ b/apps/nshlib/nsh_telnetd.c
@@ -121,7 +121,8 @@ int nsh_telnetmain(int argc, char *argv[])
}
else
{
- fprintf(pstate->cn_outstream, g_fmtcmdfailed, "fgets", NSH_ERRNO);
+ fprintf(pstate->cn_outstream, g_fmtcmdfailed, "nsh_telnetmain",
+ "fgets", NSH_ERRNO);
nsh_exit(&pstate->cn_vtbl, 1);
}
}
diff --git a/apps/system/readline/readline.c b/apps/system/readline/readline.c
index b2a87c8708..f7fa6a6351 100644
--- a/apps/system/readline/readline.c
+++ b/apps/system/readline/readline.c
@@ -164,7 +164,7 @@ static inline void readline_consolewrite(int outfd, FAR const char *buffer, size
*
* Returned values:
* On success, the (positive) number of bytes transferred is returned.
- * A length of zero would indicated an end of file condition. An failure,
+ * A length of zero would indicate an end of file condition. On failure,
* a negated errno value is returned.
*
**************************************************************************/