upstream commit

revision 1.48
date: 2019/02/04 16:45:40;  author: millert;  state: Exp;  lines: +16 -17;  commitid: cpNtVC7erojNyctw;
Make gl_pathc, gl_matchc and gl_offs size_t in glob_t to match POSIX.
This requires a libc major version bump.  OK deraadt@

1 files changed, 5 insertions, 4 deletions

diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index f069a05dc..1692d36cc 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: glob.h,v 1.11 2010/09/24 13:32:55 djm Exp $   */
+/*      $OpenBSD: glob.h,v 1.14 2019/02/04 16:45:40 millert Exp $       */
 /*      $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $     */
 
 /*
@@ -46,6 +46,7 @@
 #define _COMPAT_GLOB_H_
 
 #include <sys/stat.h>
+#include <sys/types.h>
 
 # define glob_t _ssh_compat_glob_t
 # define glob(a, b, c, d)  _ssh__compat_glob(a, b, c, d)
@@ -53,9 +54,9 @@
 
 struct stat;
 typedef struct {
-        int gl_pathc;           /* Count of total paths so far. */
-        int gl_matchc;          /* Count of paths matching pattern. */
-        int gl_offs;            /* Reserved at beginning of gl_pathv. */
+        size_t gl_pathc;        /* Count of total paths so far. */
+        size_t gl_matchc;       /* Count of paths matching pattern. */
+        size_t gl_offs;         /* Reserved at beginning of gl_pathv. */
         int gl_flags;           /* Copy of flags parameter to glob. */
         char **gl_pathv;        /* List of paths matching pattern. */
         struct stat **gl_statv; /* Stat entries corresponding to gl_pathv */