1 files changed, 7 insertions, 3 deletions

diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index 1e346a8f6..e89151789 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: glob.c,v 1.48 2019/02/04 16:45:40 millert Exp $ */
+/*      $OpenBSD: glob.c,v 1.49 2020/04/21 08:25:22 dtucker Exp $ */
 /*
  * Copyright (c) 1989, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -83,6 +83,10 @@
 
 #include "charclass.h"
 
+#ifdef TILDE
+# undef TILDE
+#endif
+
 #define DOLLAR          '$'
 #define DOT             '.'
 #define EOS             '\0'
@@ -829,7 +833,7 @@ globextend(const Char *path, glob_t *pglob, struct glob_lim *limitp,
         if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
                 /* first time around -- clear initial gl_offs items */
                 pathv += pglob->gl_offs;
-                for (i = pglob->gl_offs; --i >= 0; )
+                for (i = pglob->gl_offs; i > 0; i--)
                         *--pathv = NULL;
         }
         pglob->gl_pathv = pathv;
@@ -841,7 +845,7 @@ globextend(const Char *path, glob_t *pglob, struct glob_lim *limitp,
                 if (pglob->gl_statv == NULL && pglob->gl_offs > 0) {
                         /* first time around -- clear initial gl_offs items */
                         statv += pglob->gl_offs;
-                        for (i = pglob->gl_offs; --i >= 0; )
+                        for (i = pglob->gl_offs; i > 0; i--)
                                 *--statv = NULL;
                 }
                 pglob->gl_statv = statv;