X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Ffind_mount_point.c;h=cb00b9806f08200373804693e27805da493a6c02;hb=d21f596ddb294bdb65623ba1d0e49b17d0829229;hp=1eb5dc9429cc2c8a6cb1fa240474bd2c50d89603;hpb=bdfd0d78bc44e73d693510e70087857785b3b521;p=oweals%2Fbusybox.git

diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c
index 1eb5dc942..cb00b9806 100644
--- a/libbb/find_mount_point.c
+++ b/libbb/find_mount_point.c
@@ -2,29 +2,14 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
 #include "libbb.h"
-
-
 #include <mntent.h>
+
 /*
  * Given a block device, find the mount table entry if that block device
  * is mounted.
@@ -32,7 +17,7 @@
  * Given any other file (or directory), find the mount table entry for its
  * filesystem.
  */
-extern struct mntent *find_mount_point(const char *name, const char *table)
+struct mntent *find_mount_point(const char *name, const char *table)
 {
 	struct stat s;
 	dev_t mountDevice;
@@ -48,13 +33,16 @@ extern struct mntent *find_mount_point(const char *name, const char *table)
 		mountDevice = s.st_dev;
 
 
-	if ((mountTable = setmntent(table, "r")) == 0)
+	mountTable = setmntent(table ? table : bb_path_mtab_file, "r");
+	if (!mountTable)
 		return 0;
 
 	while ((mountEntry = getmntent(mountTable)) != 0) {
 		if (strcmp(name, mountEntry->mnt_dir) == 0
-			|| strcmp(name, mountEntry->mnt_fsname) == 0)	/* String match. */
+		 || strcmp(name, mountEntry->mnt_fsname) == 0
+		) { /* String match. */
 			break;
+		}
 		if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice)	/* Match the device. */
 			break;
 		if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice)	/* Match the directory's mount point. */
@@ -63,13 +51,3 @@ extern struct mntent *find_mount_point(const char *name, const char *table)
 	endmntent(mountTable);
 	return mountEntry;
 }
-
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/