From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/libbb/mtab_file.c | 49 ++++------------------------ 1 file changed, 6 insertions(+), 43 deletions(-) (limited to 'release/src/router/busybox/libbb/mtab_file.c') diff --git a/release/src/router/busybox/libbb/mtab_file.c b/release/src/router/busybox/libbb/mtab_file.c index c872b9a7..030b148d 100644 --- a/release/src/router/busybox/libbb/mtab_file.c +++ b/release/src/router/busybox/libbb/mtab_file.c @@ -2,51 +2,14 @@ /* * Utility routines. * - * Copyright (C) tons of folks. Tracking down who wrote what - * isn't something I'm going to worry about... If you wrote something - * here, please feel free to acknowledge your work. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Based in part on code from sash, Copyright (c) 1999 by David I. Bell - * Permission has been granted to redistribute this code under the GPL. + * Copyright (C) 1999-2004 by Erik Andersen * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include #include "libbb.h" - -/* Busybox mount uses either /proc/mounts or /dev/mtab to - * get the list of currently mounted filesystems */ -#if defined BB_FEATURE_MOUNT_MTAB_SUPPORT -const char mtab_file[] = "/etc/mtab"; -#else -# if defined BB_FEATURE_USE_DEVPS_PATCH - const char mtab_file[] = "/dev/mtab"; -# else - const char mtab_file[] = "/proc/mounts"; -# endif -#endif - - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ +/* Busybox mount uses either /proc/mounts or /etc/mtab to + * get the list of currently mounted filesystems */ +const char bb_path_mtab_file[] ALIGN1 = +USE_FEATURE_MTAB_SUPPORT("/etc/mtab")SKIP_FEATURE_MTAB_SUPPORT("/proc/mounts"); -- cgit v1.2.3-54-g00ecf