X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=df.c;h=8d6242c56c88cb08259eb28d71f5337b6692ded3;hb=62f987e95f497a21bc1455153dd156aa12718574;hp=1404e96216303ebc555d8df9cdee8d663b1bfd3c;hpb=c054b21f7d0420b1f8f8100a17fb14de9c947ef2;p=oweals%2Fbusybox.git

diff --git a/df.c b/df.c
index 1404e9621..8d6242c56 100644
--- a/df.c
+++ b/df.c
@@ -1,7 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini df implementation for busybox
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  * based on original code by (I think) Bruce Perens <bruce@pixar.com>.
  *
@@ -21,92 +22,92 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <mntent.h>
-#include <sys/stat.h>
 #include <sys/vfs.h>
-#include <fstab.h>
 
-static const char df_usage[] = "df [filesystem ...]\n"
-    "\n" "\tPrint the filesystem space used and space available.\n";
-
-extern const char mtab_file[]; /* Defined in utility.c */
+extern const char mtab_file[];	/* Defined in utility.c */
 
 static int df(char *device, const char *mountPoint)
 {
-    struct statfs s;
-    long blocks_used;
-    long blocks_percent_used;
-    struct fstab* fstabItem;
-
-    if (statfs(mountPoint, &s) != 0) {
-	perror(mountPoint);
-	return FALSE;
-    }
+	struct statfs s;
+	long blocks_used;
+	long blocks_percent_used;
 
-    if (s.f_blocks > 0) {
-	blocks_used = s.f_blocks - s.f_bfree;
-	blocks_percent_used = (long)
-	    (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
-	/* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */
-	if (strcmp (device, "/dev/root") == 0) {
-	    fstabItem = getfsfile ("/");
-	    if (fstabItem != NULL)
-		device = fstabItem->fs_spec;
+	if (statfs(mountPoint, &s) != 0) {
+		perror(mountPoint);
+		return FALSE;
 	}
-	printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
-	       device,
-	       (long) (s.f_blocks * (s.f_bsize / 1024.0)),
-	       (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0)),
-	       (long) (s.f_bavail * (s.f_bsize / 1024.0)),
-	       blocks_percent_used, mountPoint);
 
-    }
+	if (s.f_blocks > 0) {
+		blocks_used = s.f_blocks - s.f_bfree;
+		blocks_percent_used = (long)
+			(blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
+		if (strcmp(device, "/dev/root") == 0) {
+			/* Adjusts device to be the real root device,
+			 * or leaves device alone if it can't find it */
+			find_real_root_device_name( device);
+		}
+		printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
+			   device,
+			   (long) (s.f_blocks * (s.f_bsize / 1024.0)),
+			   (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0)),
+			   (long) (s.f_bavail * (s.f_bsize / 1024.0)),
+			   blocks_percent_used, mountPoint);
 
-    return TRUE;
+	}
+
+	return TRUE;
 }
 
 extern int df_main(int argc, char **argv)
 {
-    printf("%-20s %-14s %s %s %s %s\n", "Filesystem",
-	   "1k-blocks", "Used", "Available", "Use%", "Mounted on");
+	printf("%-20s %-14s %s %s %s %s\n", "Filesystem",
+		   "1k-blocks", "Used", "Available", "Use%", "Mounted on");
 
-    /* Only compiled in if BB_MTAB is not defined */
-    whine_if_fstab_is_missing();
+	if (argc > 1) {
+		struct mntent *mountEntry;
+		int status;
 
-    if (argc > 1) {
-	struct mntent *mountEntry;
-	int status;
+		if (**(argv + 1) == '-') {
+			usage(df_usage);
+		}
+		while (argc > 1) {
+			if ((mountEntry = findMountPoint(argv[1], mtab_file)) == 0) {
+				errorMsg("%s: can't find mount point.\n", argv[1]);
+				exit(FALSE);
+			}
+			status = df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
+			if (status != 0)
+				exit(status);
+			argc--;
+			argv++;
+		}
+		exit(TRUE);
+	} else {
+		FILE *mountTable;
+		struct mntent *mountEntry;
 
-	while (argc > 1) {
-	    if ((mountEntry = findMountPoint(argv[1], mtab_file)) ==
-		0) {
-		fprintf(stderr, "%s: can't find mount point.\n", argv[1]);
-		exit( FALSE);
-	    }
-	    status = df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
-	    if (status != 0)
-		exit( status);
-	    argc--;
-	    argv++;
-	}
-	exit( TRUE);
-    } else {
-	FILE *mountTable;
-	struct mntent *mountEntry;
+		mountTable = setmntent(mtab_file, "r");
+		if (mountTable == 0) {
+			perror(mtab_file);
+			exit(FALSE);
+		}
 
-	mountTable = setmntent(mtab_file, "r");
-	if (mountTable == 0) {
-	    perror(mtab_file);
-	    exit(FALSE);
+		while ((mountEntry = getmntent(mountTable))) {
+			df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
+		}
+		endmntent(mountTable);
 	}
 
-	while ((mountEntry = getmntent(mountTable))) {
-	    df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
-	}
-	endmntent(mountTable);
-    }
-
-    exit( TRUE);
+	return(TRUE);
 }
+
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/