Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sbin/dump - mark Exit() __dead



details:   https://anonhg.NetBSD.org/src/rev/f508cce1b719
branches:  trunk
changeset: 448456:f508cce1b719
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 03 12:17:14 2019 +0000

description:
- mark Exit() __dead
- bump a buffer size to avoid possible truncation
- adding missing fallthru comment

diffstat:

 sbin/dump/dump.h     |  4 ++--
 sbin/dump/snapshot.c |  4 ++--
 sbin/dump/traverse.c |  5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r 16ff379790ea -r f508cce1b719 sbin/dump/dump.h
--- a/sbin/dump/dump.h  Sun Feb 03 12:14:45 2019 +0000
+++ b/sbin/dump/dump.h  Sun Feb 03 12:17:14 2019 +0000
@@ -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   trewind(int);
 void   writerec(const char *, int);
 
-void   Exit(int);
+void   Exit(int) __dead;
 void   dumpabort(int);
 void   getfstab(void);
 
diff -r 16ff379790ea -r f508cce1b719 sbin/dump/snapshot.c
--- a/sbin/dump/snapshot.c      Sun Feb 03 12:14:45 2019 +0000
+++ b/sbin/dump/snapshot.c      Sun Feb 03 12:17:14 2019 +0000
@@ -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 @@
 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;
diff -r 16ff379790ea -r f508cce1b719 sbin/dump/traverse.c
--- a/sbin/dump/traverse.c      Sun Feb 03 12:14:45 2019 +0000
+++ b/sbin/dump/traverse.c      Sun Feb 03 12:17:14 2019 +0000
@@ -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 @@
                        case FTS_NS:
                                msg("Can't fts_read %s: %s\n", entry->fts_path,
                                    strerror(errno));
+                               /* FALLTHROUGH */
                        case FTS_DP:            /* already seen dir */
                                continue;
                        }



Home | Main Index | Thread Index | Old Index