sync with mainstream, but check more

git-svn-id: svn://busybox.net/trunk/busybox@14148 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 5 insertions, 5 deletions

diff --git a/libbb/login.c b/libbb/login.c
index 2d6162564..0abc9dced 100644
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -37,7 +37,7 @@ void print_login_issue(const char *issue_file, const char *tty)
 {
         FILE *fd;
         int c;
-        char buf[256];
+        char buf[256+1];
         const char *outbuf;
         time_t t;
         struct utsname uts;
@@ -82,8 +82,8 @@ void print_login_issue(const char *issue_file, const char *tty)
 
                                         case 'D':
                                         case 'o':
-                                                getdomainname(buf, sizeof(buf));
-                                                buf[sizeof(buf) - 1] = '\0';
+                                                c = getdomainname(buf, sizeof(buf) - 1);
+                                                buf[c >= 0 ? c : 0] = '\0'; 
                                                 break;
 
                                         case 'd':
@@ -120,8 +120,8 @@ void print_login_prompt(void)
 {
         char buf[MAXHOSTNAMELEN+1];
 
-        gethostname(buf, MAXHOSTNAMELEN);
-        fputs(buf, stdout);
+        if(gethostname(buf, MAXHOSTNAMELEN) == 0)
+                fputs(buf, stdout);
 
         fputs(LOGIN, stdout);
         fflush(stdout);