← Commit list

29d2e362d

Eric Andersen

1999-11-06

SUCCESS Duration: 3s

Subject

Fixed ln, df, and removed redundant stuff from mtab.

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Debian 14.2.0-19) 14.2.0

—

Build Log

(log yok)

Commit Diff GitHub →

Changelog +7 -0 coreutils/df.c +10 -44 coreutils/ln.c +14 -19 df.c +10 -44 internal.h +9 -1 ln.c +14 -19 mount.c +2 -3 mtab.c +0 -42 util-linux/mount.c +2 -3 utility.c +59 -0

Changelog+7 -0

@@ -1,5 +1,12 @@
	0.33
	* Fixed a bug where init could hang instead of rebooting.
+	* Removed some debugging noise from init.c
+	* Fixed ln so it works now (it was very broken).
+	* Fixed df so it won't segfault when there is no /etc/fstab,
+	* If BB_MTAB is not defined, df and mount will whine if /etc/fstab
+	is not installed (since they cannot fixup "/dev/root" to
+	state the real root device name)
+	* merged some redundant code from mtab.c/df.c into utility.c

	0.32
	* More changes -- many thanks to Lineo for paying me to work on

coreutils/df.c+10 -44

@@ -38,6 +38,7 @@ 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);
@@ -48,9 +49,12 @@ static int df(char device, const char mountPoint)
	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)
-	device = (getfsfile("/"))->fs_spec;
-
+	/* 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;
+	}
	printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
	device,
	(long) (s.f_blocks * (s.f_bsize / 1024.0)),
@@ -63,52 +67,14 @@ static int df(char device, const char mountPoint)
	return 0;
	}

-	/*
-	* Given a block device, find the mount table entry if that block device
-	* is mounted.
-	*
-	* Given any other file (or directory), find the mount table entry for its
-	* filesystem.
-	*/
-	extern struct mntent findMountPoint(const char name, const char *table)
-	{
-	struct stat s;
-	dev_t mountDevice;
-	FILE *mountTable;
-	struct mntent *mountEntry;
-
-	if (stat(name, &s) != 0)
-	return 0;
-
-	if ((s.st_mode & S_IFMT) == S_IFBLK)
-	mountDevice = s.st_rdev;
-	else
-	mountDevice = s.st_dev;
-
-
-	if ((mountTable = setmntent(table, "r")) == 0)
-	return 0;
-
-	while ((mountEntry = getmntent(mountTable)) != 0) {
-	if (strcmp(name, mountEntry->mnt_dir) == 0
-	\|\| 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. */
-	break;
-	}
-	endmntent(mountTable);
-	return mountEntry;
-	}
-
-
-
	extern int df_main(int argc, char **argv)
	{
	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;

coreutils/ln.c+14 -19

@@ -27,23 +27,21 @@
	#include <errno.h>


-	static const char ln_usage[] = "ln [-s] [-f] original-name additional-name\n"
-	"\n"
-	"\tAdd a new name that refers to the same file as \"original-name\"\n"
-	"\n"
-	"\t-s:\tUse a \"symbolic\" link, instead of a \"hard\" link.\n"
-	"\t-f:\tRemove existing destination files.\n";
+	static const char ln_usage[] = "ln [OPTION] TARGET... LINK_NAME\|DIRECTORY\n"
+	"Create a link named LINK_NAME or DIRECTORY to the specified TARGET\n"
+	"\nOptions:\n"
+	"\t-s\tmake symbolic links instead of hard links\n"
+	"\t-f\tremove existing destination files\n";


	static int symlinkFlag = FALSE;
	static int removeoldFlag = FALSE;
-	static const char *destName;


	extern int ln_main(int argc, char **argv)
	{
	int status;
-	char newdestName[NAME_MAX];
+	static char* linkName;

	if (argc < 3) {
	usage (ln_usage);
@@ -69,30 +67,27 @@ extern int ln_main(int argc, char **argv)
	}


-	destName = argv[argc - 1];
+	linkName = argv[argc - 1];

-	if ((argc > 3) && !(isDirectory(destName))) {
-	fprintf(stderr, "%s: not a directory\n", destName);
+	if ((argc > 3) && !(isDirectory(linkName))) {
+	fprintf(stderr, "%s: not a directory\n", linkName);
	exit (FALSE);
	}

	while (argc-- >= 2) {
-	strcpy(newdestName, destName);
-	strcat(newdestName, (argv)+(strlen((++argv))));
-
	if (removeoldFlag==TRUE ) {
-	status = ( unlink(newdestName) && errno != ENOENT );
+	status = ( unlink(linkName) && errno != ENOENT );
	if ( status != 0 ) {
-	perror(newdestName);
+	perror(linkName);
	exit( FALSE);
	}
	}
	if ( symlinkFlag==TRUE)
-	status = symlink(*argv, newdestName);
+	status = symlink(*argv, linkName);
	else
-	status = link(*argv, newdestName);
+	status = link(*argv, linkName);
	if ( status != 0 ) {
-	perror(newdestName);
+	perror(linkName);
	exit( FALSE);
	}
	}

df.c+10 -44

@@ -38,6 +38,7 @@ 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);
@@ -48,9 +49,12 @@ static int df(char device, const char mountPoint)
	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)
-	device = (getfsfile("/"))->fs_spec;
-
+	/* 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;
+	}
	printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
	device,
	(long) (s.f_blocks * (s.f_bsize / 1024.0)),
@@ -63,52 +67,14 @@ static int df(char device, const char mountPoint)
	return 0;
	}

-	/*
-	* Given a block device, find the mount table entry if that block device
-	* is mounted.
-	*
-	* Given any other file (or directory), find the mount table entry for its
-	* filesystem.
-	*/
-	extern struct mntent findMountPoint(const char name, const char *table)
-	{
-	struct stat s;
-	dev_t mountDevice;
-	FILE *mountTable;
-	struct mntent *mountEntry;
-
-	if (stat(name, &s) != 0)
-	return 0;
-
-	if ((s.st_mode & S_IFMT) == S_IFBLK)
-	mountDevice = s.st_rdev;
-	else
-	mountDevice = s.st_dev;
-
-
-	if ((mountTable = setmntent(table, "r")) == 0)
-	return 0;
-
-	while ((mountEntry = getmntent(mountTable)) != 0) {
-	if (strcmp(name, mountEntry->mnt_dir) == 0
-	\|\| 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. */
-	break;
-	}
-	endmntent(mountTable);
-	return mountEntry;
-	}
-
-
-
	extern int df_main(int argc, char **argv)
	{
	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;

internal.h+9 -1

@@ -29,6 +29,7 @@
	#include <string.h>
	#include <unistd.h>
	#include <sys/stat.h>
+	#include <mntent.h>


	/* Some useful definitions */
@@ -145,12 +146,19 @@ extern void my_getpwuid(char* name, uid_t uid);
	extern void my_getgrgid(char* group, gid_t gid);
	extern int get_kernel_revision();
	extern int get_console_fd(char* tty_name);
-
+	extern struct mntent findMountPoint(const char name, const char *table);
	extern void write_mtab(char* blockDevice, char* directory,
	char* filesystemType, long flags, char* string_flags);
	extern void erase_mtab(const char * name);


+	#if defined BB_MTAB
+	#define whine_if_fstab_is_missing() {}
+	#else
+	extern void whine_if_fstab_is_missing();
+	#endif
+
+
	#if defined (BB_FSCK_MINIX) \|\| defined (BB_MKFS_MINIX)

	static inline int bit(char * addr,unsigned int nr)

ln.c+14 -19

@@ -27,23 +27,21 @@
	#include <errno.h>


-	static const char ln_usage[] = "ln [-s] [-f] original-name additional-name\n"
-	"\n"
-	"\tAdd a new name that refers to the same file as \"original-name\"\n"
-	"\n"
-	"\t-s:\tUse a \"symbolic\" link, instead of a \"hard\" link.\n"
-	"\t-f:\tRemove existing destination files.\n";
+	static const char ln_usage[] = "ln [OPTION] TARGET... LINK_NAME\|DIRECTORY\n"
+	"Create a link named LINK_NAME or DIRECTORY to the specified TARGET\n"
+	"\nOptions:\n"
+	"\t-s\tmake symbolic links instead of hard links\n"
+	"\t-f\tremove existing destination files\n";


	static int symlinkFlag = FALSE;
	static int removeoldFlag = FALSE;
-	static const char *destName;


	extern int ln_main(int argc, char **argv)
	{
	int status;
-	char newdestName[NAME_MAX];
+	static char* linkName;

	if (argc < 3) {
	usage (ln_usage);
@@ -69,30 +67,27 @@ extern int ln_main(int argc, char **argv)
	}


-	destName = argv[argc - 1];
+	linkName = argv[argc - 1];

-	if ((argc > 3) && !(isDirectory(destName))) {
-	fprintf(stderr, "%s: not a directory\n", destName);
+	if ((argc > 3) && !(isDirectory(linkName))) {
+	fprintf(stderr, "%s: not a directory\n", linkName);
	exit (FALSE);
	}

	while (argc-- >= 2) {
-	strcpy(newdestName, destName);
-	strcat(newdestName, (argv)+(strlen((++argv))));
-
	if (removeoldFlag==TRUE ) {
-	status = ( unlink(newdestName) && errno != ENOENT );
+	status = ( unlink(linkName) && errno != ENOENT );
	if ( status != 0 ) {
-	perror(newdestName);
+	perror(linkName);
	exit( FALSE);
	}
	}
	if ( symlinkFlag==TRUE)
-	status = symlink(*argv, newdestName);
+	status = symlink(*argv, linkName);
	else
-	status = link(*argv, newdestName);
+	status = link(*argv, linkName);
	if ( status != 0 ) {
-	perror(newdestName);
+	perror(linkName);
	exit( FALSE);
	}
	}

mount.c+2 -3

@@ -208,14 +208,13 @@ extern int mount_main (int argc, char **argv)
	char *filesystemType = "auto";
	char *device = NULL;
	char *directory = NULL;
-	struct stat statBuf;
	int all = FALSE;
	int fakeIt = FALSE;
	int useMtab = TRUE;
	int i;

-	if (stat("/etc/fstab", &statBuf) < 0)
-	fprintf(stderr, "/etc/fstab file missing -- Please install one.\n\n");
+	/* Only compiled in if BB_MTAB is not defined */
+	whine_if_fstab_is_missing();

	if (argc == 1) {
	FILE *mountTable = setmntent (mtab_file, "r");

mtab.c+0 -42

@@ -59,48 +59,6 @@ erase_mtab(const char * name)
	perror(mtab_file);
	}

-	/*
-	* Given a block device, find the mount table entry if that block device
-	* is mounted.
-	*
-	* Given any other file (or directory), find the mount table entry for its
-	* filesystem.
-	*/
-	static struct mntent *
-	findMountPoint(const char * name, const char * table)
-	{
-	struct stat s;
-	dev_t mountDevice;
-	FILE* mountTable;
-	struct mntent* mountEntry;
-
-	if ( stat(name, &s) != 0 )
-	return 0;
-
-	if ( (s.st_mode & S_IFMT) == S_IFBLK )
-	mountDevice = s.st_rdev;
-	else
-	mountDevice = s.st_dev;
-
-
-	if ( (mountTable = setmntent(table, "r")) == 0 )
-	return 0;
-
-	while ( (mountEntry = getmntent(mountTable)) != 0 ) {
-	if ( strcmp(name, mountEntry->mnt_dir) == 0 \|\|
-	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. */
-	break;
-	}
-	endmntent(mountTable);
-	return mountEntry;
-	}
-
	extern void
	write_mtab(char* blockDevice, char* directory,
	char* filesystemType, long flags, char* string_flags)

util-linux/mount.c+2 -3

@@ -208,14 +208,13 @@ extern int mount_main (int argc, char **argv)
	char *filesystemType = "auto";
	char *device = NULL;
	char *directory = NULL;
-	struct stat statBuf;
	int all = FALSE;
	int fakeIt = FALSE;
	int useMtab = TRUE;
	int i;

-	if (stat("/etc/fstab", &statBuf) < 0)
-	fprintf(stderr, "/etc/fstab file missing -- Please install one.\n\n");
+	/* Only compiled in if BB_MTAB is not defined */
+	whine_if_fstab_is_missing();

	if (argc == 1) {
	FILE *mountTable = setmntent (mtab_file, "r");

utility.c+59 -0

@@ -868,5 +868,64 @@ extern int replace_match(char haystack, char needle, char *newNeedle, int igno


	#endif
+
+
+
+
+	#if defined BB_DF \| defined BB_MTAB
+	/*
+	* Given a block device, find the mount table entry if that block device
+	* is mounted.
+	*
+	* Given any other file (or directory), find the mount table entry for its
+	* filesystem.
+	*/
+	extern struct mntent findMountPoint(const char name, const char *table)
+	{
+	struct stat s;
+	dev_t mountDevice;
+	FILE *mountTable;
+	struct mntent *mountEntry;
+
+	if (stat(name, &s) != 0)
+	return 0;
+
+	if ((s.st_mode & S_IFMT) == S_IFBLK)
+	mountDevice = s.st_rdev;
+	else
+	mountDevice = s.st_dev;
+
+
+	if ((mountTable = setmntent(table, "r")) == 0)
+	return 0;
+
+	while ((mountEntry = getmntent(mountTable)) != 0) {
+	if (strcmp(name, mountEntry->mnt_dir) == 0
+	\|\| 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. */
+	break;
+	}
+	endmntent(mountTable);
+	return mountEntry;
+	}
+
+	#endif
+
+
+
+	#if !defined BB_MTAB && (defined BB_MOUNT \|\| defined BB_DF )
+	extern void whine_if_fstab_is_missing()
+	{
+	struct stat statBuf;
+	if (stat("/etc/fstab", &statBuf) < 0)
+	fprintf(stderr, "/etc/fstab file missing -- install one to name /dev/root.\n\n");
+	}
+	#endif
+
+
	/* END CODE */

+