[BusyBox] df using getopt and ls -k patch

[Richard June]

here is df.c using getopt, I still think it's ugly, but it appears to
work.
I added -k support(or rather ignorance :-) ) to ls as well, there's a
patch to it. how does it look?
-------------- next part --------------
--- ls.c	Sat Jan  6 21:40:31 2001
+++ ls.c.old	Sat Jan  6 21:48:26 2001
@@ -706,7 +706,7 @@
 
 	applet_name= argv[0];
 	/* process options */
-	while ((opt = getopt(argc, argv, "k1AaCdgilnsx"
+	while ((opt = getopt(argc, argv, "1AaCdgilnsx"
 #ifdef BB_FEATURE_AUTOWIDTH
 "T:w:"
 #endif
@@ -727,7 +727,6 @@
 #endif
 	)) > 0) {
 		switch (opt) {
-			case 'k': break;
 			case '1': style_fmt = STYLE_SINGLE; break;
 			case 'A': disp_opts |= DISP_HIDDEN; break;
 			case 'a': disp_opts |= DISP_HIDDEN | DISP_DOT; break;
-------------- next part --------------
/* vi: set sw=4 ts=4: */
/*
 * Mini df implementation for busybox
 *
 * Copyright (C) 1999,2000 by Lineo, inc.
 * Written by Erik Andersen <andersen at lineo.com>, <andersee at debian.org>
 * based on original code by (I think) Bruce Perens <bruce at pixar.com>.
 *
 * 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
 *
 */

#include "busybox.h"
#include <stdio.h>
#include <mntent.h>
#include <sys/vfs.h>

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;

	if (statfs(mountPoint, &s) != 0) {
		perror(mountPoint);
		return FALSE;
	}

	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;
}

extern int df_main(int argc, char **argv)
{
	int opt = 0, ac = 0, oi = 0;
	int status = 0;
	char **av;
	FILE *mountTable;
	struct mntent *mountEntry;

	printf("%-20s %-14s %s %s %s %s\n", "Filesystem",
		   "1k-blocks", "Used", "Available", "Use%", "Mounted on");

	while ((opt = getopt(argc, argv, "hk")) > 0)
	{
		switch (opt) {
			case 'h': goto print_df_usage; break;
		}
	}

	ac = argc - optind;   /* how many cmd line args are left */
	if (ac < 1) {
		av = (char **)xcalloc((size_t)1, (size_t)(sizeof(char *)));
		av[0]= xstrdup(".");
		ac=1;
	} else {
		av = (char **)xcalloc((size_t)ac, (size_t)(sizeof(char *)));
		for(oi = 0 ; oi < ac; oi++) {
			av[oi]= argv[optind++];  /* copy pointer to real cmd line arg */
		}
	}

	if(ac && strcmp(".", av[0]))
	{
		while(ac > 0)
		{
			if ((mountEntry = findMountPoint(av[0], mtab_file)) == 0) {
				errorMsg("%s: can't find mount point.\n", av[0]);
				return(FALSE);
			}
			status = df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
			if (status != 0)
				return(status);
			ac--;
			av++;
		}
		return(TRUE);
	}

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

	return(TRUE);

print_df_usage:
	usage(df_usage);
	return(FALSE);
}

/*
Local Variables:
c-file-style: "linux"
c-basic-offset: 4
tab-width: 4
End:
*/