summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2018-09-07 04:26:56 +0000
committerDamien Miller <djm@mindrot.org>2018-09-09 14:50:32 +1000
commitde37ca909487d23e5844aca289b3f5e75d3f1e1f (patch)
tree727d83c131abe01dce3cbe90617af667b65b9903
parent247766cd3111d5d8c6ea39833a3257ca8fb820f2 (diff)
upstream: Add FALLTHROUGH comments where appropriate. Patch from
jjelen at redhat via bz#2687. OpenBSD-Commit-ID: c48eb457be697a19d6d2950c6d0879f3ccc851d3
-rw-r--r--sftp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sftp.c b/sftp.c
index d068f7e0f..7db86c2d3 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.185 2018/04/26 14:47:03 bluhm Exp $ */ 1/* $OpenBSD: sftp.c,v 1.186 2018/09/07 04:26:56 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1443,6 +1443,7 @@ parse_args(const char **cpp, int *ignore_errors, int *aflag,
1443 case I_LUMASK: 1443 case I_LUMASK:
1444 case I_CHMOD: 1444 case I_CHMOD:
1445 base = 8; 1445 base = 8;
1446 /* FALLTHROUGH */
1446 case I_CHOWN: 1447 case I_CHOWN:
1447 case I_CHGRP: 1448 case I_CHGRP:
1448 if ((optidx = parse_no_flags(cmd, argv, argc)) == -1) 1449 if ((optidx = parse_no_flags(cmd, argv, argc)) == -1)
@@ -1541,6 +1542,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
1541 break; 1542 break;
1542 case I_SYMLINK: 1543 case I_SYMLINK:
1543 sflag = 1; 1544 sflag = 1;
1545 /* FALLTHROUGH */
1544 case I_LINK: 1546 case I_LINK:
1545 if (!sflag) 1547 if (!sflag)
1546 path1 = make_absolute(path1, *pwd); 1548 path1 = make_absolute(path1, *pwd);