From 78047153f3f320f60a8264a8a33abb8636dbfc7c Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 23 Dec 2016 22:42:14 +0000 Subject: MFC r308493, r308619: Update amd from am-utils 6.1.5 to 6.2. Used extensively on my network over the past ten weeks. Reviewed by: pfg, brooks Suggested by: pfg Obtained from: ftp://ftp.am-utils.org/pub/am-utils/ Relnotes: yes Differential Revision: D8405 --- contrib/amd/libamu/hasmntopt.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'contrib/amd/libamu/hasmntopt.c') diff --git a/contrib/amd/libamu/hasmntopt.c b/contrib/amd/libamu/hasmntopt.c index 14cceb5..e5a6f2e 100644 --- a/contrib/amd/libamu/hasmntopt.c +++ b/contrib/amd/libamu/hasmntopt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2006 Erez Zadok + * Copyright (c) 1997-2014 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -16,11 +16,7 @@ n * modification, are permitted provided that the following conditions * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgment: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -67,7 +63,7 @@ nextmntopt(char **p) /* * Skip past white space */ - while (*cp && isspace((int) *cp)) + while (*cp && isspace((unsigned char) *cp)) cp++; /* @@ -106,7 +102,7 @@ amu_hasmntopt(mntent_t *mnt, char *opt) char t[MNTMAXSTR]; char *f; char *o = t; - int l = strlen(opt); + size_t l = strlen(opt); xstrlcpy(t, mnt->mnt_opts, sizeof(t)); -- cgit v1.1