Module Name: src
Committed By: joerg
Date: Fri Jun 28 15:04:35 UTC 2013
Modified Files:
src/bin/ed: re.c
src/crypto/external/bsd/libsaslc/dist/src: mech_digestmd5.c xsess.c
src/libexec/ftpd: cmds.c
src/usr.bin/sed: compile.c
src/usr.sbin/moused: moused.c
Log Message:
Fix violations of the sequence point rule.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/bin/ed/re.c
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/libsaslc/dist/src/xsess.c
cvs rdiff -u -r1.31 -r1.32 src/libexec/ftpd/cmds.c
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/sed/compile.c
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/moused/moused.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ed/re.c
diff -u src/bin/ed/re.c:1.19 src/bin/ed/re.c:1.20
--- src/bin/ed/re.c:1.19 Thu Feb 17 16:29:26 2005
+++ src/bin/ed/re.c Fri Jun 28 15:04:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: re.c,v 1.19 2005/02/17 16:29:26 xtraeme Exp $ */
+/* $NetBSD: re.c,v 1.20 2013/06/28 15:04:35 joerg Exp $ */
/* re.c: This file contains the regular expression interface routines for
the ed line editor. */
@@ -33,7 +33,7 @@
#if 0
static char *rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
#else
-__RCSID("$NetBSD: re.c,v 1.19 2005/02/17 16:29:26 xtraeme Exp $");
+__RCSID("$NetBSD: re.c,v 1.20 2013/06/28 15:04:35 joerg Exp $");
#endif
#endif /* not lint */
@@ -95,7 +95,7 @@ extract_pattern(int delimiter)
default:
break;
case '[':
- if ((nd = parse_char_class(++nd)) == NULL) {
+ if ((nd = parse_char_class(nd + 1)) == NULL) {
sprintf(errmsg, "unbalanced brackets ([])");
return NULL;
}
Index: src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c
diff -u src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.10 src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.11
--- src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.10 Sun Feb 20 01:59:46 2011
+++ src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c Fri Jun 28 15:04:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mech_digestmd5.c,v 1.10 2011/02/20 01:59:46 christos Exp $ */
+/* $NetBSD: mech_digestmd5.c,v 1.11 2013/06/28 15:04:35 joerg Exp $ */
/* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mech_digestmd5.c,v 1.10 2011/02/20 01:59:46 christos Exp $");
+__RCSID("$NetBSD: mech_digestmd5.c,v 1.11 2013/06/28 15:04:35 joerg Exp $");
#include <sys/param.h>
@@ -1626,7 +1626,7 @@ saslc__mech_digestmd5_parse_challenge(sa
if (val == NULL)
goto no_mem;
*val = '\0';
- val = strip_quotes(++val);
+ val = strip_quotes(val + 1);
saslc__msg_dbg("key='%s' val='%s'\n", key, val);
switch (get_challenge_t(key)) {
Index: src/crypto/external/bsd/libsaslc/dist/src/xsess.c
diff -u src/crypto/external/bsd/libsaslc/dist/src/xsess.c:1.6 src/crypto/external/bsd/libsaslc/dist/src/xsess.c:1.7
--- src/crypto/external/bsd/libsaslc/dist/src/xsess.c:1.6 Sun Feb 20 01:59:46 2011
+++ src/crypto/external/bsd/libsaslc/dist/src/xsess.c Fri Jun 28 15:04:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: xsess.c,v 1.6 2011/02/20 01:59:46 christos Exp $ */
+/* $NetBSD: xsess.c,v 1.7 2013/06/28 15:04:35 joerg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: xsess.c,v 1.6 2011/02/20 01:59:46 christos Exp $");
+__RCSID("$NetBSD: xsess.c,v 1.7 2013/06/28 15:04:35 joerg Exp $");
#include <assert.h>
#include <saslc.h>
@@ -91,7 +91,7 @@ normalize_list_string(char *opts)
break;
if (p > opts && p[-1] != ',')
*p++ = ',';
- p = skip_WS(++p);
+ p = skip_WS(p + 1);
}
}
Index: src/libexec/ftpd/cmds.c
diff -u src/libexec/ftpd/cmds.c:1.31 src/libexec/ftpd/cmds.c:1.32
--- src/libexec/ftpd/cmds.c:1.31 Tue Jun 19 06:06:34 2012
+++ src/libexec/ftpd/cmds.c Fri Jun 28 15:04:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.31 2012/06/19 06:06:34 dholland Exp $ */
+/* $NetBSD: cmds.c,v 1.32 2013/06/28 15:04:35 joerg Exp $ */
/*
* Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: cmds.c,v 1.31 2012/06/19 06:06:34 dholland Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.32 2013/06/28 15:04:35 joerg Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -878,7 +878,7 @@ discover_path(char *last_path, const cha
cp = tp;
nomorelink = 1;
- while ((cp = strstr(++cp, "/")) != NULL) {
+ while ((cp = strstr(cp + 1, "/")) != NULL) {
sz1 = (unsigned long)cp - (unsigned long)tp;
if (sz1 > MAXPATHLEN)
goto bad;
Index: src/usr.bin/sed/compile.c
diff -u src/usr.bin/sed/compile.c:1.38 src/usr.bin/sed/compile.c:1.39
--- src/usr.bin/sed/compile.c:1.38 Fri Dec 14 08:16:51 2012
+++ src/usr.bin/sed/compile.c Fri Jun 28 15:04:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compile.c,v 1.38 2012/12/14 08:16:51 msaitoh Exp $ */
+/* $NetBSD: compile.c,v 1.39 2013/06/28 15:04:35 joerg Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#if 0
static char sccsid[] = "@(#)compile.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: compile.c,v 1.38 2012/12/14 08:16:51 msaitoh Exp $");
+__RCSID("$NetBSD: compile.c,v 1.39 2013/06/28 15:04:35 joerg Exp $");
#endif
#endif /* not lint */
@@ -657,7 +657,7 @@ compile_tr(char *p, char **transtab)
goto bad;
}
new = xmalloc(strlen(p) + 1);
- p = compile_delimited(--p, new);
+ p = compile_delimited(p - 1, new);
if (p == NULL) {
err(COMPILE, "unterminated transform target string");
goto bad;
Index: src/usr.sbin/moused/moused.c
diff -u src/usr.sbin/moused/moused.c:1.22 src/usr.sbin/moused/moused.c:1.23
--- src/usr.sbin/moused/moused.c:1.22 Wed Aug 31 16:32:48 2011
+++ src/usr.sbin/moused/moused.c Fri Jun 28 15:04:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: moused.c,v 1.22 2011/08/31 16:32:48 christos Exp $ */
+/* $NetBSD: moused.c,v 1.23 2013/06/28 15:04:35 joerg Exp $ */
/**
** Copyright (c) 1995 Michael Smith, All rights reserved.
**
@@ -48,7 +48,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: moused.c,v 1.22 2011/08/31 16:32:48 christos Exp $");
+__RCSID("$NetBSD: moused.c,v 1.23 2013/06/28 15:04:35 joerg Exp $");
#endif /* not lint */
#include <ctype.h>
@@ -2045,7 +2045,7 @@ r_installmap(char *arg)
return FALSE;
lbutton = atoi(s);
- arg = skipspace(++arg);
+ arg = skipspace(arg + 1);
s = arg;
while (isdigit((unsigned char)*arg))
++arg;
