Module Name: src
Committed By: christos
Date: Mon Feb 15 22:48:59 UTC 2016
Modified Files:
src/lib/libedit: config.h readline.c sys.h
Log Message:
OpenBSD readline.c rev. 1.14 2015/02/06 23:21:58 millert
use SIZE_MAX
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libedit/config.h
cvs rdiff -u -r1.118 -r1.119 src/lib/libedit/readline.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libedit/sys.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/config.h
diff -u src/lib/libedit/config.h:1.6 src/lib/libedit/config.h:1.7
--- src/lib/libedit/config.h:1.6 Mon Feb 15 11:14:39 2016
+++ src/lib/libedit/config.h Mon Feb 15 17:48:59 2016
@@ -256,6 +256,9 @@
/* Version number of package */
#define VERSION "3.0"
+/* Define to 1 if the system provides the SIZE_MAX constant */
+#define HAVE_SIZE_MAX 1
+
/* Define to 1 if you want wide-character code */
/* #undef WIDECHAR */
Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.118 src/lib/libedit/readline.c:1.119
--- src/lib/libedit/readline.c:1.118 Mon Feb 15 16:58:37 2016
+++ src/lib/libedit/readline.c Mon Feb 15 17:48:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.118 2016/02/15 21:58:37 christos Exp $ */
+/* $NetBSD: readline.c,v 1.119 2016/02/15 22:48:59 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,12 +31,13 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.118 2016/02/15 21:58:37 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.119 2016/02/15 22:48:59 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
+#include <stdint.h>
#include <dirent.h>
#include <string.h>
#include <pwd.h>
@@ -2201,7 +2202,7 @@ rl_completion_matches(const char *str, r
}
qsort(&list[1], len - 1, sizeof(*list),
(int (*)(const void *, const void *)) strcmp);
- min = SIZE_T_MAX;
+ min = SIZE_MAX;
for (i = 1, a = list[i]; i < len - 1; i++, a = b) {
b = list[i + 1];
for (j = 0; a[j] && a[j] == b[j]; j++)
Index: src/lib/libedit/sys.h
diff -u src/lib/libedit/sys.h:1.20 src/lib/libedit/sys.h:1.21
--- src/lib/libedit/sys.h:1.20 Mon Feb 15 12:35:39 2016
+++ src/lib/libedit/sys.h Mon Feb 15 17:48:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sys.h,v 1.20 2016/02/15 17:35:39 christos Exp $ */
+/* $NetBSD: sys.h,v 1.21 2016/02/15 22:48:59 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -109,8 +109,8 @@ wchar_t *wcsdup(const wchar_t *);
typedef unsigned int u_int32_t;
#endif
-#ifndef SIZE_T_MAX
-#define SIZE_T_MAX ((size_t)-1)
+#ifndef HAVE_SIZE_MAX
+#define SIZE_MAX ((size_t)-1)
#endif
#define REGEX /* Use POSIX.2 regular expression functions */
