Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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).
This commit is contained in:
martin 2019-08-16 19:30:41 +00:00
parent 2d5d7454fc
commit b210271a54
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/fsck_ext2fs/main.c
View File

@ -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, 1986, 1993\
#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/03 03:19:26 mrg Exp $");
#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);
}

5
sbin/fsck_ffs/main.c
View File

@ -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, 1986, 1993\
#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/05 14:59:06 christos Exp $");
#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);

3
sbin/fsck_lfs/main.c
View File

@ -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);