Module Name: src
Committed By: mrg
Date: Sun Feb 3 12:17:14 UTC 2019
Modified Files:
src/sbin/dump: dump.h snapshot.c traverse.c
Log Message:
- mark Exit() __dead
- bump a buffer size to avoid possible truncation
- adding missing fallthru comment
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sbin/dump/dump.h
cvs rdiff -u -r1.6 -r1.7 src/sbin/dump/snapshot.c
cvs rdiff -u -r1.50 -r1.51 src/sbin/dump/traverse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dump/dump.h
diff -u src/sbin/dump/dump.h:1.54 src/sbin/dump/dump.h:1.55
--- src/sbin/dump/dump.h:1.54 Mon Nov 16 17:06:47 2015
+++ src/sbin/dump/dump.h Sun Feb 3 12:17:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dump.h,v 1.54 2015/11/16 17:06:47 christos Exp $ */
+/* $NetBSD: dump.h,v 1.55 2019/02/03 12:17:14 mrg Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -224,7 +224,7 @@ void startnewtape(int);
void trewind(int);
void writerec(const char *, int);
-void Exit(int);
+void Exit(int) __dead;
void dumpabort(int);
void getfstab(void);
Index: src/sbin/dump/snapshot.c
diff -u src/sbin/dump/snapshot.c:1.6 src/sbin/dump/snapshot.c:1.7
--- src/sbin/dump/snapshot.c:1.6 Thu Feb 24 09:38:57 2011
+++ src/sbin/dump/snapshot.c Sun Feb 3 12:17:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: snapshot.c,v 1.6 2011/02/24 09:38:57 hannken Exp $ */
+/* $NetBSD: snapshot.c,v 1.7 2019/02/03 12:17:14 mrg Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@ int
snap_open(char *file, char *backup, time_t *snap_date, char **snap_dev)
{
int i, n, fd, israw, fsinternal, dounlink;
- char path[MAXPATHLEN], fss_dev[14], *cp;
+ char path[MAXPATHLEN], fss_dev[20], *cp;
dev_t mountdev;
struct fss_set fss;
struct fss_get fsg;
Index: src/sbin/dump/traverse.c
diff -u src/sbin/dump/traverse.c:1.50 src/sbin/dump/traverse.c:1.51
--- src/sbin/dump/traverse.c:1.50 Sat Jun 15 01:27:19 2013
+++ src/sbin/dump/traverse.c Sun Feb 3 12:17:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: traverse.c,v 1.50 2013/06/15 01:27:19 christos Exp $ */
+/* $NetBSD: traverse.c,v 1.51 2019/02/03 12:17:14 mrg Exp $ */
/*-
* Copyright (c) 1980, 1988, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95";
#else
-__RCSID("$NetBSD: traverse.c,v 1.50 2013/06/15 01:27:19 christos Exp $");
+__RCSID("$NetBSD: traverse.c,v 1.51 2019/02/03 12:17:14 mrg Exp $");
#endif
#endif /* not lint */
@@ -199,6 +199,7 @@ mapfiles(ino_t maxino, u_int64_t *tape_s
case FTS_NS:
msg("Can't fts_read %s: %s\n", entry->fts_path,
strerror(errno));
+ /* FALLTHROUGH */
case FTS_DP: /* already seen dir */
continue;
}
