upstream commit

Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then
use those definitions rather than pulling <sys/param.h> and unknown namespace
pollution. ok djm markus dtucker

Upstream-ID: 712cafa816c9f012a61628b66b9fbd5687223fb8

1 files changed, 9 insertions, 10 deletions

diff --git a/sftp.c b/sftp.c
index 08e13a733..1b5c92498 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.175 2016/07/22 03:47:36 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.176 2016/09/12 01:22:38 deraadt Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -17,7 +17,6 @@
 
 #include "includes.h"
 
-#include <sys/param.h>  /* MIN MAX */
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #ifdef HAVE_SYS_STAT_H
@@ -802,7 +801,7 @@ do_ls_dir(struct sftp_conn *conn, const char *path,
                 /* Count entries for sort and find longest filename */
                 for (n = 0; d[n] != NULL; n++) {
                         if (d[n]->filename[0] != '.' || (lflag & LS_SHOW_ALL))
-                                m = MAX(m, strlen(d[n]->filename));
+                                m = MAXIMUM(m, strlen(d[n]->filename));
                 }
 
                 /* Add any subpath that also needs to be counted */
@@ -814,9 +813,9 @@ do_ls_dir(struct sftp_conn *conn, const char *path,
                         width = ws.ws_col;
 
                 columns = width / (m + 2);
-                columns = MAX(columns, 1);
+                columns = MAXIMUM(columns, 1);
                 colspace = width / columns;
-                colspace = MIN(colspace, width);
+                colspace = MINIMUM(colspace, width);
         }
 
         if (lflag & SORT_FLAGS) {
@@ -915,10 +914,10 @@ do_globbed_ls(struct sftp_conn *conn, const char *path,
         if (!(lflag & LS_SHORT_VIEW)) {
                 /* Count entries for sort and find longest filename */
                 for (i = 0; g.gl_pathv[i]; i++)
-                        m = MAX(m, strlen(g.gl_pathv[i]));
+                        m = MAXIMUM(m, strlen(g.gl_pathv[i]));
 
                 columns = width / (m + 2);
-                columns = MAX(columns, 1);
+                columns = MAXIMUM(columns, 1);
                 colspace = width / columns;
         }
 
@@ -1669,16 +1668,16 @@ complete_display(char **list, u_int len)
 
         /* Count entries for sort and find longest */
         for (y = 0; list[y]; y++)
-                m = MAX(m, strlen(list[y]));
+                m = MAXIMUM(m, strlen(list[y]));
 
         if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) != -1)
                 width = ws.ws_col;
 
         m = m > len ? m - len : 0;
         columns = width / (m + 2);
-        columns = MAX(columns, 1);
+        columns = MAXIMUM(columns, 1);
         colspace = width / columns;
-        colspace = MIN(colspace, width);
+        colspace = MINIMUM(colspace, width);
 
         printf("\n");
         m = 1;