Module Name: src
Committed By: martin
Date: Fri Aug 16 19:30:42 UTC 2019
Modified Files:
src/sbin/fsck_ext2fs [netbsd-9]: main.c
src/sbin/fsck_ffs [netbsd-9]: main.c
src/sbin/fsck_lfs [netbsd-9]: main.c
Log Message:
Pull up following revision(s) (requested by kamil in ticket #73):
sbin/fsck_lfs/main.c: revision 1.54
sbin/fsck_ext2fs/main.c: revision 1.40
sbin/fsck_ffs/main.c: revision 1.86
fsck: Stop defining the same variable concurrently in bss and data
returntosingle was defined in multiple places:
- fsck_lfs/main.c
- fsck_ffs/main.c
- fsck_ext2fs/main.c
- fsck/fsutil.c
Keep the fsutil.c definition as the only one.
Detected during the build of telned with Address Sanitizer (MKSANITIZER).
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.39.2.1 src/sbin/fsck_ext2fs/main.c
cvs rdiff -u -r1.85 -r1.85.2.1 src/sbin/fsck_ffs/main.c
cvs rdiff -u -r1.53 -r1.53.2.1 src/sbin/fsck_lfs/main.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/fsck_ext2fs/main.c
diff -u src/sbin/fsck_ext2fs/main.c:1.39 src/sbin/fsck_ext2fs/main.c:1.39.2.1
--- src/sbin/fsck_ext2fs/main.c:1.39 Sun Feb 3 03:19:26 2019
+++ src/sbin/fsck_ext2fs/main.c Fri Aug 16 19:30:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.39 2019/02/03 03:19:26 mrg Exp $ */
+/* $NetBSD: main.c,v 1.39.2.1 2019/08/16 19:30:41 martin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -63,7 +63,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94";
#else
-__RCSID("$NetBSD: main.c,v 1.39 2019/02/03 03:19:26 mrg Exp $");
+__RCSID("$NetBSD: main.c,v 1.39.2.1 2019/08/16 19:30:41 martin Exp $");
#endif
#endif /* not lint */
@@ -87,7 +87,6 @@ __RCSID("$NetBSD: main.c,v 1.39 2019/02/
#include "fsutil.h"
#include "exitvalues.h"
-volatile sig_atomic_t returntosingle = 0;
static int argtoi(int, const char *, const char *, int);
@@ -354,4 +353,3 @@ usage(void)
getprogname());
exit(FSCK_EXIT_USAGE);
}
-
Index: src/sbin/fsck_ffs/main.c
diff -u src/sbin/fsck_ffs/main.c:1.85 src/sbin/fsck_ffs/main.c:1.85.2.1
--- src/sbin/fsck_ffs/main.c:1.85 Sun May 5 14:59:06 2019
+++ src/sbin/fsck_ffs/main.c Fri Aug 16 19:30:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.85 2019/05/05 14:59:06 christos Exp $ */
+/* $NetBSD: main.c,v 1.85.2.1 2019/08/16 19:30:42 martin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#else
-__RCSID("$NetBSD: main.c,v 1.85 2019/05/05 14:59:06 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.85.2.1 2019/08/16 19:30:42 martin Exp $");
#endif
#endif /* not lint */
@@ -71,7 +71,6 @@ __RCSID("$NetBSD: main.c,v 1.85 2019/05/
#include "snapshot.h"
int progress = 0;
-volatile sig_atomic_t returntosingle = 0;
static int argtoi(int, const char *, const char *, int);
static int checkfilesys(const char *, const char *, int);
Index: src/sbin/fsck_lfs/main.c
diff -u src/sbin/fsck_lfs/main.c:1.53 src/sbin/fsck_lfs/main.c:1.53.2.1
--- src/sbin/fsck_lfs/main.c:1.53 Sun Feb 3 03:19:26 2019
+++ src/sbin/fsck_lfs/main.c Fri Aug 16 19:30:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.53 2019/02/03 03:19:26 mrg Exp $ */
+/* $NetBSD: main.c,v 1.53.2.1 2019/08/16 19:30:41 martin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -53,7 +53,6 @@
#include "fsutil.h"
#include "exitvalues.h"
-volatile sig_atomic_t returntosingle = 0;
static int argtoi(int, const char *, const char *, int);
static int checkfilesys(const char *, char *, long, int);
