Vladimir's last_patch13, containing several bugfixes.

7 files changed, 218 insertions, 64 deletions

diff --git a/Makefile b/Makefile
index 16da9fd47..62786b9e8 100644
--- a/Makefile
+++ b/Makefile
@@ -241,7 +241,7 @@ concat_path_file.c copy_file.c copy_file_chunk.c create_path.c \
 daemon.c deb_extract.c device_open.c error_msg.c error_msg_and_die.c \
 find_mount_point.c find_pid_by_name.c find_root_device.c full_read.c \
 full_write.c get_ar_headers.c get_console.c get_last_path_component.c \
-get_line_from_file.c gz_open.c human_readable.c inode_hash.c isdirectory.c \
+get_line_from_file.c gz_open.c human_readable.c isdirectory.c \
 kernel_version.c loop.c mode_string.c module_syscalls.c mtab.c mtab_file.c \
 my_getgrnam.c my_getgrgid.c my_getpwnam.c my_getpwnamegid.c my_getpwuid.c \
 parse_mode.c parse_number.c perror_msg.c perror_msg_and_die.c print_file.c \
diff --git a/coreutils/du.c b/coreutils/du.c
index 3e4821a39..fd19855e1 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -71,6 +71,78 @@ static void print_summary(long size, char *filename)
 	}
 }
 
+#define HASH_SIZE       311             /* Should be prime */
+#define hash_inode(i)   ((i) % HASH_SIZE)
+
+typedef struct ino_dev_hash_bucket_struct {
+  struct ino_dev_hash_bucket_struct *next;
+  ino_t ino;
+  dev_t dev;
+  char name[1];
+} ino_dev_hashtable_bucket_t;
+
+static ino_dev_hashtable_bucket_t *ino_dev_hashtable[HASH_SIZE];
+
+/*
+ * Return 1 if statbuf->st_ino && statbuf->st_dev are recorded in
+ * `ino_dev_hashtable', else return 0
+ *
+ * If NAME is a non-NULL pointer to a character pointer, and there is
+ * a match, then set *NAME to the value of the name slot in that
+ * bucket.
+ */
+static int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name)
+{
+	ino_dev_hashtable_bucket_t *bucket;
+
+	bucket = ino_dev_hashtable[hash_inode(statbuf->st_ino)];
+	while (bucket != NULL) {
+	  if ((bucket->ino == statbuf->st_ino) &&
+		  (bucket->dev == statbuf->st_dev))
+	  {
+		if (name) *name = bucket->name;
+		return 1;
+	  }
+	  bucket = bucket->next;
+	}
+	return 0;
+}
+
+/* Add statbuf to statbuf hash table */
+static void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
+{
+	int i;
+	size_t s;
+	ino_dev_hashtable_bucket_t *bucket;
+
+	i = hash_inode(statbuf->st_ino);
+	s = name ? strlen(name) : 0;
+	bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + s);
+	bucket->ino = statbuf->st_ino;
+	bucket->dev = statbuf->st_dev;
+	if (name)
+		strcpy(bucket->name, name);
+	else
+		bucket->name[0] = '\0';
+	bucket->next = ino_dev_hashtable[i];
+	ino_dev_hashtable[i] = bucket;
+}
+
+/* Clear statbuf hash table */
+static void reset_ino_dev_hashtable(void)
+{
+	int i;
+	ino_dev_hashtable_bucket_t *bucket;
+
+	for (i = 0; i < HASH_SIZE; i++) {
+		while (ino_dev_hashtable[i] != NULL) {
+			bucket = ino_dev_hashtable[i]->next;
+			free(ino_dev_hashtable[i]);
+			ino_dev_hashtable[i] = bucket;
+		}
+	}
+}
+
 /* tiny recursive du */
 static long du(char *filename)
 {
@@ -187,7 +259,7 @@ int du_main(int argc, char **argv)
 	return status;
 }
 
-/* $Id: du.c,v 1.47 2001/05/07 22:49:43 andersen Exp $ */
+/* $Id: du.c,v 1.48 2001/06/01 21:47:15 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"
diff --git a/du.c b/du.c
index 3e4821a39..fd19855e1 100644
--- a/du.c
+++ b/du.c
@@ -71,6 +71,78 @@ static void print_summary(long size, char *filename)
 	}
 }
 
+#define HASH_SIZE       311             /* Should be prime */
+#define hash_inode(i)   ((i) % HASH_SIZE)
+
+typedef struct ino_dev_hash_bucket_struct {
+  struct ino_dev_hash_bucket_struct *next;
+  ino_t ino;
+  dev_t dev;
+  char name[1];
+} ino_dev_hashtable_bucket_t;
+
+static ino_dev_hashtable_bucket_t *ino_dev_hashtable[HASH_SIZE];
+
+/*
+ * Return 1 if statbuf->st_ino && statbuf->st_dev are recorded in
+ * `ino_dev_hashtable', else return 0
+ *
+ * If NAME is a non-NULL pointer to a character pointer, and there is
+ * a match, then set *NAME to the value of the name slot in that
+ * bucket.
+ */
+static int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name)
+{
+	ino_dev_hashtable_bucket_t *bucket;
+
+	bucket = ino_dev_hashtable[hash_inode(statbuf->st_ino)];
+	while (bucket != NULL) {
+	  if ((bucket->ino == statbuf->st_ino) &&
+		  (bucket->dev == statbuf->st_dev))
+	  {
+		if (name) *name = bucket->name;
+		return 1;
+	  }
+	  bucket = bucket->next;
+	}
+	return 0;
+}
+
+/* Add statbuf to statbuf hash table */
+static void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
+{
+	int i;
+	size_t s;
+	ino_dev_hashtable_bucket_t *bucket;
+
+	i = hash_inode(statbuf->st_ino);
+	s = name ? strlen(name) : 0;
+	bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + s);
+	bucket->ino = statbuf->st_ino;
+	bucket->dev = statbuf->st_dev;
+	if (name)
+		strcpy(bucket->name, name);
+	else
+		bucket->name[0] = '\0';
+	bucket->next = ino_dev_hashtable[i];
+	ino_dev_hashtable[i] = bucket;
+}
+
+/* Clear statbuf hash table */
+static void reset_ino_dev_hashtable(void)
+{
+	int i;
+	ino_dev_hashtable_bucket_t *bucket;
+
+	for (i = 0; i < HASH_SIZE; i++) {
+		while (ino_dev_hashtable[i] != NULL) {
+			bucket = ino_dev_hashtable[i]->next;
+			free(ino_dev_hashtable[i]);
+			ino_dev_hashtable[i] = bucket;
+		}
+	}
+}
+
 /* tiny recursive du */
 static long du(char *filename)
 {
@@ -187,7 +259,7 @@ int du_main(int argc, char **argv)
 	return status;
 }
 
-/* $Id: du.c,v 1.47 2001/05/07 22:49:43 andersen Exp $ */
+/* $Id: du.c,v 1.48 2001/06/01 21:47:15 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"
diff --git a/include/libbb.h b/include/libbb.h
index 4e324bf86..31bd97f2e 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -92,16 +92,6 @@ const char *time_string(time_t timeVal);
 int is_directory(const char *name, int followLinks, struct stat *statBuf);
 int isDevice(const char *name);
 
-typedef struct ino_dev_hash_bucket_struct {
-  struct ino_dev_hash_bucket_struct *next;
-  ino_t ino;
-  dev_t dev;
-  char name[1];
-} ino_dev_hashtable_bucket_t;
-int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name);
-void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name);
-void reset_ino_dev_hashtable(void);
-
 int remove_file(const char *path, int flags);
 int copy_file(const char *source, const char *dest, int flags);
 int copy_file_chunk(FILE *src_file, FILE *dst_file, unsigned long long chunksize);
diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c
index edfd7085a..f8f68464d 100644
--- a/libbb/find_root_device.c
+++ b/libbb/find_root_device.c
@@ -1,10 +1,9 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Utility routines.
+ * Copyright (C) 2000,2001 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
- * 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.
+ * Patched by a bunch of people.  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
@@ -20,9 +19,6 @@
  * 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.
- *
  */
 
 #include <stdio.h>
@@ -38,45 +34,42 @@ extern char *find_real_root_device_name(const char* name)
 	DIR *dir;
 	struct dirent *entry;
 	struct stat statBuf, rootStat;
-	char *fileName;
+	char *fileName = NULL;
 	dev_t dev;
 
-	if (stat("/", &rootStat) != 0) {
+	if (stat("/", &rootStat) != 0) 
 		perror_msg("could not stat '/'");
-		return NULL;
-	}
-	if ((dev = rootStat.st_rdev)==0) dev=rootStat.st_dev;
+	else {
+		if ((dev = rootStat.st_rdev)==0) 
+			dev=rootStat.st_dev;
 
-	dir = opendir("/dev");
-	if (!dir) {
-		perror_msg("could not open '/dev'");
-		goto fallback;
-	}
+		dir = opendir("/dev");
+		if (!dir) 
+			perror_msg("could not open '/dev'");
+		else {
+			while((entry = readdir(dir)) != NULL) {
 
-	while((entry = readdir(dir)) != NULL) {
+				/* Must skip ".." since that is "/", and so we 
+				 * would get a false positive on ".."  */
+				if (strcmp(entry->d_name, "..") == 0)
+					continue;
 
-		/* Must skip ".." since that is "/", and so we 
-		 * would get a false positive on ".."  */
-		if (strcmp(entry->d_name, "..") == 0)
-			continue;
+				fileName = concat_path_file("/dev", entry->d_name);
 
-		fileName = concat_path_file("/dev/", entry->d_name);
-
-		/* Some char devices have the same dev_t as block
-		 * devices, so make sure this is a block device */
-		if (stat(fileName, &statBuf) == 0 && 
-				S_ISBLK(statBuf.st_mode)!=0 &&
-				statBuf.st_rdev == dev) {
-			return fileName; 
+				/* Some char devices have the same dev_t as block
+				 * devices, so make sure this is a block device */
+				if (stat(fileName, &statBuf) == 0 && 
+						S_ISBLK(statBuf.st_mode)!=0 &&
+						statBuf.st_rdev == dev) 
+					break;
+				free(fileName);
+				fileName=NULL;
+			}
+			closedir(dir);
 		}
-		free(fileName);
 	}
-	closedir(dir);
-
-fallback:
-	/* don't use stack space, caller expects to free() result */
-	fileName=xmalloc(20);
-	sprintf(fileName,"(rdev %u)",(unsigned int) rootStat.st_rdev);
+	if(fileName==NULL)
+		fileName=xstrdup("/dev/root");
 	return fileName;
 }
 
diff --git a/libbb/interface.c b/libbb/interface.c
index 1d36c13bb..8eb03a61c 100644
--- a/libbb/interface.c
+++ b/libbb/interface.c
@@ -3,7 +3,7 @@
  *              that either displays or sets the characteristics of
  *              one or more of the system's networking interfaces.
  *
- * Version:     $Id: interface.c,v 1.2 2001/05/05 03:19:12 bug1 Exp $
+ * Version:     $Id: interface.c,v 1.3 2001/06/01 21:47:15 andersen Exp $
  *
  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  *              and others.  Copyright 1993 MicroWalt Corporation
@@ -49,6 +49,7 @@
 #undef HAVE_AFNETROM
 #undef HAVE_AFX25
 #undef HAVE_AFECONET
+#undef HAVE_AFASH
 
 /* 
  * 
@@ -83,7 +84,7 @@
 #define _(x) x
 #define _PATH_PROCNET_DEV               "/proc/net/dev"
 #define new(p) ((p) = xcalloc(1,sizeof(*(p))))
-#define KRELEASE(maj,min,patch) ((maj) * 10000 + (min)*1000 + (patch))
+#define KRELEASE(maj,min,patch) ((maj) * 65536 + (min)*256 + (patch))
 
 static int procnetdev_vsn = 1;
 
@@ -174,15 +175,31 @@ static struct aftype *aftypes[];
 #ifdef KEEP_UNUSED
 
 static int flag_unx;
+#ifdef HAVE_AFIPX
 static int flag_ipx;
+#endif
+#ifdef HAVE_AFX25
 static int flag_ax25;
+#endif
+#ifdef HAVE_AFATALK
 static int flag_ddp;
+#endif
+#ifdef HAVE_AFNETROM
 static int flag_netrom;
+#endif
 static int flag_inet;
+#ifdef HAVE_AFINET6
 static int flag_inet6;
+#endif
+#ifdef HAVE_AFECONET
 static int flag_econet;
+#endif
+#ifdef HAVE_AFX25
 static int flag_x25 = 0;
+#endif
+#ifdef HAVE_AFASH
 static int flag_ash;
+#endif
 
 
 static struct aftrans_t {
@@ -191,48 +208,68 @@ static struct aftrans_t {
     int *flag;
 } aftrans[] = {
 
+#ifdef HAVE_AFX25
     {
 	"ax25", "ax25", &flag_ax25
     },
+#endif
     {
 	"ip", "inet", &flag_inet
     },
+#ifdef HAVE_AFINET6
     {
 	"ip6", "inet6", &flag_inet6
     },
+#endif
+#ifdef HAVE_AFIPX
     {
 	"ipx", "ipx", &flag_ipx
     },
+#endif
+#ifdef HAVE_AFATALK
     {
 	"appletalk", "ddp", &flag_ddp
     },
+#endif
+#ifdef HAVE_AFNETROM
     {
 	"netrom", "netrom", &flag_netrom
     },
+#endif
     {
 	"inet", "inet", &flag_inet
     },
+#ifdef HAVE_AFINET6
     {
 	"inet6", "inet6", &flag_inet6
     },
+#endif
+#ifdef HAVE_AFATALK
     {
 	"ddp", "ddp", &flag_ddp
     },
+#endif
     {
 	"unix", "unix", &flag_unx
     },
     {
 	"tcpip", "inet", &flag_inet
     },
+#ifdef HAVE_AFECONET
     {
 	"econet", "ec", &flag_econet
     },
+#endif
+#ifdef HAVE_AFX25
     {
 	"x25", "x25", &flag_x25
     },
+#endif
+#ifdef HAVE_AFASH
     {
         "ash", "ash", &flag_ash
     },
+#endif
     {
 	0, 0, 0
     }
@@ -694,7 +731,7 @@ static int aftrans_opt(const char *arg)
 
     while (tmp1) {
 
-	tmp2 = index(tmp1, ',');
+	tmp2 = strchr(tmp1, ',');
 
 	if (tmp2)
 	    *(tmp2++) = '\0';
@@ -777,7 +814,7 @@ static struct aftype *get_aftype(const char *name)
 	    return (*afp);
 	afp++;
     }
-    if (index(name, ','))
+    if (strchr(name, ','))
 	fprintf(stderr, _("Please don't supply more than one address family.\n"));
     return (NULL);
 }
diff --git a/libbb/libbb.h b/libbb/libbb.h
index 4e324bf86..31bd97f2e 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -92,16 +92,6 @@ const char *time_string(time_t timeVal);
 int is_directory(const char *name, int followLinks, struct stat *statBuf);
 int isDevice(const char *name);
 
-typedef struct ino_dev_hash_bucket_struct {
-  struct ino_dev_hash_bucket_struct *next;
-  ino_t ino;
-  dev_t dev;
-  char name[1];
-} ino_dev_hashtable_bucket_t;
-int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name);
-void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name);
-void reset_ino_dev_hashtable(void);
-
 int remove_file(const char *path, int flags);
 int copy_file(const char *source, const char *dest, int flags);
 int copy_file_chunk(FILE *src_file, FILE *dst_file, unsigned long long chunksize);