generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gethostname.c: change to report ENAMETOOLONG error when buflen is less

Browse Source 
change to behaviour the same as glibc for the check about buflen

Change-Id: I98265a8fe441df6fed2527686f89b087364ca53d
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
This commit is contained in:
Yongqin Liu 2014-10-30 16:34:55 +08:00 committed by Elliott Hughes
parent d94e7f0f1d
commit 2f954bab2d
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@ -43,7 +43,6 @@ libc_common_src_files := \
bionic/ether_aton.c \
bionic/ether_ntoa.c \
bionic/fts.c \
bionic/gethostname.c \
bionic/getpriority.c \
bionic/if_indextoname.c \
bionic/if_nametoindex.c \
@ -120,6 +119,7 @@ libc_bionic_src_files := \
bionic/getauxval.cpp \
bionic/getcwd.cpp \
bionic/getentropy_linux.c \
bionic/gethostname.cpp \
bionic/getpgrp.cpp \
bionic/getpid.cpp \
bionic/gettid.cpp \

31
libc/bionic/gethostname.c → libc/bionic/gethostname.cpp
View File

@ -25,27 +25,24 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <sys/utsname.h>
#include <unistd.h>
int gethostname(char* buff, size_t buflen)
{
struct utsname name;
int result = 0;
int gethostname(char* buf, size_t n) {
struct utsname name;
if (uname(&name) == -1) {
return -1;
}
result = uname(&name);
if (result != -1)
{
int namelen = strlen(name.nodename);
size_t name_length = static_cast<size_t>(strlen(name.nodename) + 1);
if (name_length > n) {
errno = ENAMETOOLONG;
return -1;
}
if ((int)buflen < namelen+1) {
errno = EINVAL;
result = -1;
} else {
memcpy( buff, name.nodename, namelen+1 );
}
}
return result;
memcpy(buf, name.nodename, name_length);
return 0;
}

14
tests/unistd_test.cpp
View File

@ -482,21 +482,23 @@ TEST(unistd, sethostname) {
TEST(unistd, gethostname) {
char hostname[HOST_NAME_MAX + 1];
memset(hostname, 0, sizeof(hostname));
// Can we get the hostname with a big buffer?
ASSERT_EQ(0, gethostname(hostname, HOST_NAME_MAX));
// Can we get the hostname with a right-sized buffer?
errno = 0;
ASSERT_EQ(0, gethostname(hostname, strlen(hostname) + 1));
// Does uname(2) agree?
utsname buf;
ASSERT_EQ(0, uname(&buf));
ASSERT_EQ(0, strncmp(hostname, buf.nodename, SYS_NMLN));
ASSERT_GT(strlen(hostname), 0U);
// Do we correctly detect truncation?
errno = 0;
ASSERT_EQ(-1, gethostname(hostname, strlen(hostname)));
ASSERT_EQ(ENAMETOOLONG, errno);
errno = 0;
ASSERT_EQ(0, gethostname(hostname, -2));
ASSERT_EQ(0, errno);
GTEST_LOG_(INFO) << "hostname=" << hostname << "\n";
}