11 files changed, 143 insertions, 51 deletions

diff --git a/win32/dirent.c b/win32/dirent.c
index 795fc779c..f0e8deae2 100644
--- a/win32/dirent.c
+++ b/win32/dirent.c
@@ -3,7 +3,9 @@
 struct DIR {
         struct dirent dd_dir;
         HANDLE dd_handle;     /* FindFirstFile handle */
-        int dd_stat;          /* 0-based index */
+        int not_first;
+        int got_dot;
+        int got_dotdot;
 };
 
 static inline void finddata2dirent(struct dirent *ent, WIN32_FIND_DATAA *fdata)
@@ -59,9 +61,11 @@ DIR *opendir(const char *name)
         }
 
         /* initialize DIR structure and copy first dir entry */
-        dir = xmalloc(sizeof(DIR));
+        dir = xzalloc(sizeof(DIR));
         dir->dd_handle = h;
-        dir->dd_stat = 0;
+        /* dir->not_first = 0; */
+        /* dir->got_dot = 0; */
+        /* dir->got_dotdot = 0; */
         finddata2dirent(&dir->dd_dir, &fdata);
         return dir;
 }
@@ -74,11 +78,17 @@ struct dirent *readdir(DIR *dir)
         }
 
         /* if first entry, dirent has already been set up by opendir */
-        if (dir->dd_stat) {
+        if (dir->not_first) {
                 /* get next entry and convert from WIN32_FIND_DATA to dirent */
                 WIN32_FIND_DATAA fdata;
                 if (FindNextFileA(dir->dd_handle, &fdata)) {
                         finddata2dirent(&dir->dd_dir, &fdata);
+                } else if (!dir->got_dot) {
+                        strcpy(dir->dd_dir.d_name, ".");
+                        dir->dd_dir.d_type = DT_DIR;
+                } else if (!dir->got_dotdot) {
+                        strcpy(dir->dd_dir.d_name, "..");
+                        dir->dd_dir.d_type = DT_DIR;
                 } else {
                         DWORD lasterr = GetLastError();
                         /* POSIX says you shouldn't set errno when readdir can't
@@ -89,7 +99,15 @@ struct dirent *readdir(DIR *dir)
                 }
         }
 
-        ++dir->dd_stat;
+        /* Have we seen '.' or '..'? */
+        if (dir->dd_dir.d_name[0] == '.') {
+                if (dir->dd_dir.d_name[1] == '\0')
+                        dir->got_dot = TRUE;
+                else if (dir->dd_dir.d_name[1] == '.' && dir->dd_dir.d_name[2] == '\0')
+                        dir->got_dotdot = TRUE;
+        }
+
+        dir->not_first = TRUE;
         return &dir->dd_dir;
 }
 
diff --git a/win32/glob.c b/win32/glob.c
index 1cc6483e7..35a1e9a65 100644
--- a/win32/glob.c
+++ b/win32/glob.c
@@ -298,7 +298,7 @@ int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, i
                         if (append(&tail, pat, strlen(pat), 0))
                                 return GLOB_NOSPACE;
                         cnt++;
-                } else
+                } else if (!error)
                         return GLOB_NOMATCH;
         }
 
diff --git a/win32/inet_pton.c b/win32/inet_pton.c
index f229a9355..eec8bd2fe 100644
--- a/win32/inet_pton.c
+++ b/win32/inet_pton.c
@@ -78,6 +78,7 @@ int inet_pton(int af, const char *restrict s, void *restrict a0)
                         if (s[j]!='.' || (i<6 && brk<0)) return 0;
                         need_v4=1;
                         i++;
+                        ip[i&7]=0;
                         break;
                 }
                 s += j+1;
diff --git a/win32/ioctl.c b/win32/ioctl.c
index 93f9f504d..d0ed68d61 100644
--- a/win32/ioctl.c
+++ b/win32/ioctl.c
@@ -1,5 +1,7 @@
 #include "libbb.h"
+#include "lazyload.h"
 
+#if ENABLE_STTY || ENABLE_TTYSIZE
 static int mingw_get_terminal_width_height(struct winsize *win)
 {
         int fd;
@@ -21,6 +23,45 @@ static int mingw_get_terminal_width_height(struct winsize *win)
 
         return -1;
 }
+#endif
+
+#if ENABLE_STTY
+static int mingw_set_terminal_width_height(struct winsize *win)
+{
+        BOOL ret;
+        DECLARE_PROC_ADDR(BOOL, GetConsoleScreenBufferInfoEx, HANDLE,
+                                PCONSOLE_SCREEN_BUFFER_INFOEX);
+        DECLARE_PROC_ADDR(BOOL, SetConsoleScreenBufferInfoEx, HANDLE,
+                                PCONSOLE_SCREEN_BUFFER_INFOEX);
+
+        if (!INIT_PROC_ADDR(kernel32.dll, GetConsoleScreenBufferInfoEx))
+                return -1;
+        if (!INIT_PROC_ADDR(kernel32.dll, SetConsoleScreenBufferInfoEx))
+                return -1;
+
+        for (int fd = STDOUT_FILENO; fd <= STDERR_FILENO; ++fd) {
+                CONSOLE_SCREEN_BUFFER_INFOEX sbi;
+                HANDLE handle = (HANDLE)_get_osfhandle(fd);
+
+                sbi.cbSize = sizeof(sbi);
+                if (handle != INVALID_HANDLE_VALUE &&
+                                (ret=GetConsoleScreenBufferInfoEx(handle, &sbi)) != 0) {
+                        if (sbi.dwSize.X != win->ws_col) {
+                                sbi.dwSize.X = win->ws_col;
+                        }
+                        if (sbi.dwSize.Y < win->ws_row) {
+                                sbi.dwSize.Y = win->ws_row;
+                        }
+                        sbi.srWindow.Bottom = sbi.srWindow.Top + win->ws_row;
+                        sbi.srWindow.Right = sbi.srWindow.Left + win->ws_col;
+                        ret = SetConsoleScreenBufferInfoEx(handle, &sbi);
+                        break;
+                }
+        }
+
+        return ret ? 0 : -1;
+}
+#endif
 
 int ioctl(int fd UNUSED_PARAM, int code, ...)
 {
@@ -31,10 +72,18 @@ int ioctl(int fd UNUSED_PARAM, int code, ...)
         va_start(ap, code);
 
         switch (code) {
+#if ENABLE_STTY || ENABLE_TTYSIZE
         case TIOCGWINSZ:
                 arg = va_arg(ap, void *);
                 ret = mingw_get_terminal_width_height((struct winsize *)arg);
                 break;
+#endif
+#if ENABLE_STTY
+        case TIOCSWINSZ:
+                arg = va_arg(ap, void *);
+                ret = mingw_set_terminal_width_height((struct winsize *)arg);
+                break;
+#endif
         default:
                 ret = -1;
                 errno = EINVAL;
diff --git a/win32/mingw.c b/win32/mingw.c
index cb1f84f30..061e7bac6 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -2560,3 +2560,12 @@ int mingw_shell_execute(SHELLEXECUTEINFO *info)
         free(lpath);
         return ret;
 }
+
+#if ENABLE_FEATURE_USE_CNG_API
+void mingw_die_if_error(NTSTATUS status, const char *function_name) {
+        if (!NT_SUCCESS(status)) {
+                bb_error_msg_and_die("call to %s failed: 0x%08lX",
+                                                                function_name, (unsigned long)status);
+        }
+}
+#endif
diff --git a/win32/process.c b/win32/process.c
index 33f45ee42..0d120936e 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -795,7 +795,7 @@ UNUSED_PARAM
         return sp;
 }
 
-void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
+int FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
 {
         const char *str, *cmdline;
 
@@ -807,6 +807,7 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
         else
                 cmdline = comm;
         safe_strncpy(buf, cmdline, col);
+        return 0;
 }
 
 /**
diff --git a/win32/select.c b/win32/select.c
index 2be221ac8..46a051cfc 100644
--- a/win32/select.c
+++ b/win32/select.c
@@ -273,8 +273,11 @@ mingw_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds,
   int i, fd, rc;
   clock_t tend = 0;
 
-  if (nfds > FD_SETSIZE)
-    nfds = FD_SETSIZE;
+  if (nfds < 0 || nfds > FD_SETSIZE)
+    {
+      errno = EINVAL;
+      return -1;
+    }
 
   if (!timeout)
     wait_timeout = INFINITE;
diff --git a/win32/strptime.c b/win32/strptime.c
index 3205b95a2..c12e96202 100644
--- a/win32/strptime.c
+++ b/win32/strptime.c
@@ -1,23 +1,23 @@
-/* Copyright (C) 2002, 2004-2005, 2007, 2009-2020 Free Software Foundation,
+/* Copyright (C) 2002, 2004-2005, 2007, 2009-2024 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
+   This file is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU Lesser General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, see <https://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
  * File from gnulib (https://www.gnu.org/software/gnulib/), processed with
- *    coan source -U_LIBC -U_NL_CURRENT -UHAVE_TM_GMTOFF strptime.c
+ *    coan source -U_LIBC -U_NL_CURRENT -UHAVE_STRUCT_TM_TM_GMTOFF strptime.c
  * and lightly edited.
  *
  * A form of support for tm_gmtoff was later restored.
@@ -30,7 +30,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
-#include <stdbool.h>
+#include <strings.h>
 
 
 enum ptime_locale_status { not, loc, raw };
@@ -543,23 +543,23 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tm,
 
   if ((have_uweek || have_wweek) && have_wday)
     {
-      int save_wday = tm->tm_wday;
-      int save_mday = tm->tm_mday;
-      int save_mon = tm->tm_mon;
+      int saved_wday = tm->tm_wday;
+      int saved_mday = tm->tm_mday;
+      int saved_mon = tm->tm_mon;
       int w_offset = have_uweek ? 0 : 1;
 
       tm->tm_mday = 1;
       tm->tm_mon = 0;
       day_of_the_week (tm);
       if (have_mday)
-        tm->tm_mday = save_mday;
+        tm->tm_mday = saved_mday;
       if (have_mon)
-        tm->tm_mon = save_mon;
+        tm->tm_mon = saved_mon;
 
       if (!have_yday)
         tm->tm_yday = ((7 - (tm->tm_wday - w_offset)) % 7
                        + (week_no - 1) *7
-                       + save_wday - w_offset);
+                       + saved_wday - w_offset);
 
       if (!have_mday || !have_mon)
         {
@@ -575,7 +575,7 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tm,
                  - __mon_yday[__isleap(1900 + tm->tm_year)][t_mon - 1] + 1);
         }
 
-      tm->tm_wday = save_wday;
+      tm->tm_wday = saved_wday;
     }
 
   return (char *) rp;
diff --git a/win32/termios.c b/win32/termios.c
index f18ff7c3b..b94f68f59 100644
--- a/win32/termios.c
+++ b/win32/termios.c
@@ -2,12 +2,10 @@
 
 int tcsetattr(int fd, int mode UNUSED_PARAM, const struct termios *t)
 {
-        if (terminal_mode(FALSE) & VT_INPUT) {
-                HANDLE h = (HANDLE)_get_osfhandle(fd);
-                if (!SetConsoleMode(h, t->imode)) {
-                        errno = err_win_to_posix();
-                        return -1;
-                }
+        HANDLE h = (HANDLE)_get_osfhandle(fd);
+        if (!SetConsoleMode(h, t->w_mode)) {
+                errno = err_win_to_posix();
+                return -1;
         }
 
         return 0;
@@ -15,16 +13,20 @@ int tcsetattr(int fd, int mode UNUSED_PARAM, const struct termios *t)
 
 int tcgetattr(int fd, struct termios *t)
 {
-        if (terminal_mode(FALSE) & VT_INPUT) {
-                HANDLE h = (HANDLE)_get_osfhandle(fd);
-                if (!GetConsoleMode(h, &t->imode)) {
-                        errno = err_win_to_posix();
-                        return -1;
-                }
+        HANDLE h = (HANDLE)_get_osfhandle(fd);
+        if (!GetConsoleMode(h, &t->w_mode)) {
+                errno = err_win_to_posix();
+                return -1;
         }
+
         t->c_cc[VINTR] = 3;     // ctrl-c
         t->c_cc[VEOF] = 4;      // ctrl-d
 
+        if (t->w_mode & ENABLE_ECHO_INPUT)
+                t->c_lflag |= ECHO;
+        else
+                t->c_lflag &= ~ECHO;
+
         return 0;
 }
 
diff --git a/win32/termios.h b/win32/termios.h
index 8408aa3e3..60c51119b 100644
--- a/win32/termios.h
+++ b/win32/termios.h
@@ -1,23 +1,32 @@
 #ifndef TERMIOS_H
 #define TERMIOS_H
 
-#define VINTR 0
-#define VEOF  1
+#define ECHO    0x0004
 
-#define TCIFLUSH    0
-#define TCSAFLUSH   1
-#define TCSANOW     2
-#define TCSADRAIN   3
-#define TCSADFLUSH  4
+#define VINTR           0
+#define VEOF            1
+
+#define TCIFLUSH        0
+#define TCSAFLUSH       1
+#define TCSANOW         2
+#define TCSADRAIN       3
+#define TCSADFLUSH      4
+
+#define CSIZE   0
 
 typedef unsigned char cc_t;
+typedef unsigned int  tcflag_t;
 typedef unsigned int  speed_t;
 
-#define NCCS            2
+#define NCCS            18
 struct termios {
+        tcflag_t        c_iflag;
+        tcflag_t        c_oflag;
+        tcflag_t        c_cflag;
+        tcflag_t        c_lflag;
+        char            c_line;
         cc_t            c_cc[NCCS];
-        unsigned long   imode;
-        unsigned long   omode;
+        unsigned long   w_mode;
 };
 
 struct winsize {
diff --git a/win32/winansi.c b/win32/winansi.c
index c7529c453..427c71f11 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -160,7 +160,7 @@ int FAST_FUNC terminal_mode(int reset)
                                         mode |= VT_INPUT;
                                 }
 
-                                if (newmode != oldmode) {
+                                if (reset && newmode != oldmode) {
                                         if (!SetConsoleMode(h, newmode)) {
                                                 if (mode >= 4)
                                                         mode &= ~VT_INPUT;
@@ -1182,7 +1182,7 @@ char *winansi_fgets(char *s, int size, FILE *stream)
 /* Ensure that isatty(fd) returns 0 for the NUL device */
 int mingw_isatty(int fd)
 {
-        int result = _isatty(fd);
+        int result = _isatty(fd) != 0;
 
         if (result) {
                 HANDLE handle = (HANDLE) _get_osfhandle(fd);