Vladimir's last_patch13, containing several bugfixes.

git-svn-id: svn://busybox.net/trunk/busybox@2779 69ca8d6d-28ef-0310-b511-8ec308f3f277
author: andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> 2001-06-01 21:47:15 +0000
committer: andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> 2001-06-01 21:47:15 +0000
commit: a95fa3cae0e63dd7d3bbe8672a81a0ffd5c4de67 (patch)
tree: c833c8f3a72637660af61b061b90d69d987fed25 /libbb
parent: 36bc4bcd564d935828df0cb4c8b88ab245fc3b69 (diff)
download: busybox-w32-a95fa3cae0e63dd7d3bbe8672a81a0ffd5c4de67.tar.gz
busybox-w32-a95fa3cae0e63dd7d3bbe8672a81a0ffd5c4de67.tar.bz2
busybox-w32-a95fa3cae0e63dd7d3bbe8672a81a0ffd5c4de67.zip
3 files changed, 71 insertions, 51 deletions
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
+ * Patched by a bunch of people.  Feel free to acknowledge your work.
- * isn't something I'm going to worry about...  If you wrote something
- * here, please 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;
+        else {
-        }
+                if ((dev = rootStat.st_rdev)==0) 
-        if ((dev = rootStat.st_rdev)==0) dev=rootStat.st_dev;
+                        dev=rootStat.st_dev;
-        dir = opendir("/dev");
+                dir = opendir("/dev");
-        if (!dir) {
+                if (!dir) 
-                perror_msg("could not open '/dev'");
+                        perror_msg("could not open '/dev'");
-                goto fallback;
+                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 
+                                fileName = concat_path_file("/dev", entry->d_name);
-                 * would get a false positive on ".."  */
-                if (strcmp(entry->d_name, "..") == 0)
-                        continue;
-                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 */
-                /* Some char devices have the same dev_t as block
+                                if (stat(fileName, &statBuf) == 0 && 
-                 * devices, so make sure this is a block device */
+                                                S_ISBLK(statBuf.st_mode)!=0 &&
-                if (stat(fileName, &statBuf) == 0 && 
+                                                statBuf.st_rdev == dev) 
-                                S_ISBLK(statBuf.st_mode)!=0 &&
+                                        break;
-                                statBuf.st_rdev == dev) {
+                                free(fileName);
-                        return fileName; 
+                                fileName=NULL;
+                        }
+                        closedir(dir);
                }
-                free(fileName);
        }
-        closedir(dir);
+        if(fileName==NULL)
+                fileName=xstrdup("/dev/root");
-fallback:
-        /* don't use stack space, caller expects to free() result */
-        fileName=xmalloc(20);
-        sprintf(fileName,"(rdev %u)",(unsigned int) rootStat.st_rdev);
        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);
author	andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>	2001-06-01 21:47:15 +0000
committer	andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>	2001-06-01 21:47:15 +0000
commit	a95fa3cae0e63dd7d3bbe8672a81a0ffd5c4de67 (patch)
tree	c833c8f3a72637660af61b061b90d69d987fed25 /libbb
parent	36bc4bcd564d935828df0cb4c8b88ab245fc3b69 (diff)
download	busybox-w32-a95fa3cae0e63dd7d3bbe8672a81a0ffd5c4de67.tar.gz busybox-w32-a95fa3cae0e63dd7d3bbe8672a81a0ffd5c4de67.tar.bz2 busybox-w32-a95fa3cae0e63dd7d3bbe8672a81a0ffd5c4de67.zip

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 @@
1	/* vi: set sw=4 ts=4: */	1	/* vi: set sw=4 ts=4: */
2	/*	2	/*
3	* Utility routines.	3	* Copyright (C) 2000,2001 by Lineo, inc.
		4	* Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
4	*	5	*
5	* Copyright (C) tons of folks. Tracking down who wrote what	6	* Patched by a bunch of people. Feel free to acknowledge your work.
6	* isn't something I'm going to worry about... If you wrote something
7	* here, please feel free to acknowledge your work.
8	*	7	*
9	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
@@ -20,9 +19,6 @@
20	* along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
21	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	20	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22	*	21	*
23	* Based in part on code from sash, Copyright (c) 1999 by David I. Bell
24	* Permission has been granted to redistribute this code under the GPL.
25	*
26	*/	22	*/
27		23
28	#include <stdio.h>	24	#include <stdio.h>
@@ -38,45 +34,42 @@ extern char find_real_root_device_name(const char name)
38	DIR *dir;	34	DIR *dir;
39	struct dirent *entry;	35	struct dirent *entry;
40	struct stat statBuf, rootStat;	36	struct stat statBuf, rootStat;
41	char *fileName;	37	char *fileName = NULL;
42	dev_t dev;	38	dev_t dev;
43		39
44	if (stat("/", &rootStat) != 0) {	40	if (stat("/", &rootStat) != 0)
45	perror_msg("could not stat '/'");	41	perror_msg("could not stat '/'");
46	return NULL;	42	else {
47	}	43	if ((dev = rootStat.st_rdev)==0)
48	if ((dev = rootStat.st_rdev)==0) dev=rootStat.st_dev;	44	dev=rootStat.st_dev;
49		45
50	dir = opendir("/dev");	46	dir = opendir("/dev");
51	if (!dir) {	47	if (!dir)
52	perror_msg("could not open '/dev'");	48	perror_msg("could not open '/dev'");
53	goto fallback;	49	else {
54	}	50	while((entry = readdir(dir)) != NULL) {
55		51
56	while((entry = readdir(dir)) != NULL) {	52	/* Must skip ".." since that is "/", and so we
		53	* would get a false positive on ".." */
		54	if (strcmp(entry->d_name, "..") == 0)
		55	continue;
57		56
58	/* Must skip ".." since that is "/", and so we	57	fileName = concat_path_file("/dev", entry->d_name);
59	* would get a false positive on ".." */
60	if (strcmp(entry->d_name, "..") == 0)
61	continue;
62		58
63	fileName = concat_path_file("/dev/", entry->d_name);	59	/* Some char devices have the same dev_t as block
64		60	* devices, so make sure this is a block device */
65	/* Some char devices have the same dev_t as block	61	if (stat(fileName, &statBuf) == 0 &&
66	* devices, so make sure this is a block device */	62	S_ISBLK(statBuf.st_mode)!=0 &&
67	if (stat(fileName, &statBuf) == 0 &&	63	statBuf.st_rdev == dev)
68	S_ISBLK(statBuf.st_mode)!=0 &&	64	break;
69	statBuf.st_rdev == dev) {	65	free(fileName);
70	return fileName;	66	fileName=NULL;
		67	}
		68	closedir(dir);
71	}	69	}
72	free(fileName);
73	}	70	}
74	closedir(dir);	71	if(fileName==NULL)
75		72	fileName=xstrdup("/dev/root");
76	fallback:
77	/* don't use stack space, caller expects to free() result */
78	fileName=xmalloc(20);
79	sprintf(fileName,"(rdev %u)",(unsigned int) rootStat.st_rdev);
80	return fileName;	73	return fileName;
81	}	74	}
82		75


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 @@
3	* that either displays or sets the characteristics of	3	* that either displays or sets the characteristics of
4	* one or more of the system's networking interfaces.	4	* one or more of the system's networking interfaces.
5	*	5	*
6	* Version: $Id: interface.c,v 1.2 2001/05/05 03:19:12 bug1 Exp $	6	* Version: $Id: interface.c,v 1.3 2001/06/01 21:47:15 andersen Exp $
7	*	7	*
8	* Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>	8	* Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
9	* and others. Copyright 1993 MicroWalt Corporation	9	* and others. Copyright 1993 MicroWalt Corporation
@@ -49,6 +49,7 @@
49	#undef HAVE_AFNETROM	49	#undef HAVE_AFNETROM
50	#undef HAVE_AFX25	50	#undef HAVE_AFX25
51	#undef HAVE_AFECONET	51	#undef HAVE_AFECONET
		52	#undef HAVE_AFASH
52		53
53	/*	54	/*
54	*	55	*
@@ -83,7 +84,7 @@
83	#define _(x) x	84	#define _(x) x
84	#define _PATH_PROCNET_DEV "/proc/net/dev"	85	#define _PATH_PROCNET_DEV "/proc/net/dev"
85	#define new(p) ((p) = xcalloc(1,sizeof(*(p))))	86	#define new(p) ((p) = xcalloc(1,sizeof(*(p))))
86	#define KRELEASE(maj,min,patch) ((maj) * 10000 + (min)*1000 + (patch))	87	#define KRELEASE(maj,min,patch) ((maj) * 65536 + (min)*256 + (patch))
87		88
88	static int procnetdev_vsn = 1;	89	static int procnetdev_vsn = 1;
89		90
@@ -174,15 +175,31 @@ static struct aftype *aftypes[];
174	#ifdef KEEP_UNUSED	175	#ifdef KEEP_UNUSED
175		176
176	static int flag_unx;	177	static int flag_unx;
		178	#ifdef HAVE_AFIPX
177	static int flag_ipx;	179	static int flag_ipx;
		180	#endif
		181	#ifdef HAVE_AFX25
178	static int flag_ax25;	182	static int flag_ax25;
		183	#endif
		184	#ifdef HAVE_AFATALK
179	static int flag_ddp;	185	static int flag_ddp;
		186	#endif
		187	#ifdef HAVE_AFNETROM
180	static int flag_netrom;	188	static int flag_netrom;
		189	#endif
181	static int flag_inet;	190	static int flag_inet;
		191	#ifdef HAVE_AFINET6
182	static int flag_inet6;	192	static int flag_inet6;
		193	#endif
		194	#ifdef HAVE_AFECONET
183	static int flag_econet;	195	static int flag_econet;
		196	#endif
		197	#ifdef HAVE_AFX25
184	static int flag_x25 = 0;	198	static int flag_x25 = 0;
		199	#endif
		200	#ifdef HAVE_AFASH
185	static int flag_ash;	201	static int flag_ash;
		202	#endif
186		203
187		204
188	static struct aftrans_t {	205	static struct aftrans_t {
@@ -191,48 +208,68 @@ static struct aftrans_t {
191	int *flag;	208	int *flag;
192	} aftrans[] = {	209	} aftrans[] = {
193		210
		211	#ifdef HAVE_AFX25
194	{	212	{
195	"ax25", "ax25", &flag_ax25	213	"ax25", "ax25", &flag_ax25
196	},	214	},
		215	#endif
197	{	216	{
198	"ip", "inet", &flag_inet	217	"ip", "inet", &flag_inet
199	},	218	},
		219	#ifdef HAVE_AFINET6
200	{	220	{
201	"ip6", "inet6", &flag_inet6	221	"ip6", "inet6", &flag_inet6
202	},	222	},
		223	#endif
		224	#ifdef HAVE_AFIPX
203	{	225	{
204	"ipx", "ipx", &flag_ipx	226	"ipx", "ipx", &flag_ipx
205	},	227	},
		228	#endif
		229	#ifdef HAVE_AFATALK
206	{	230	{
207	"appletalk", "ddp", &flag_ddp	231	"appletalk", "ddp", &flag_ddp
208	},	232	},
		233	#endif
		234	#ifdef HAVE_AFNETROM
209	{	235	{
210	"netrom", "netrom", &flag_netrom	236	"netrom", "netrom", &flag_netrom
211	},	237	},
		238	#endif
212	{	239	{
213	"inet", "inet", &flag_inet	240	"inet", "inet", &flag_inet
214	},	241	},
		242	#ifdef HAVE_AFINET6
215	{	243	{
216	"inet6", "inet6", &flag_inet6	244	"inet6", "inet6", &flag_inet6
217	},	245	},
		246	#endif
		247	#ifdef HAVE_AFATALK
218	{	248	{
219	"ddp", "ddp", &flag_ddp	249	"ddp", "ddp", &flag_ddp
220	},	250	},
		251	#endif
221	{	252	{
222	"unix", "unix", &flag_unx	253	"unix", "unix", &flag_unx
223	},	254	},
224	{	255	{
225	"tcpip", "inet", &flag_inet	256	"tcpip", "inet", &flag_inet
226	},	257	},
		258	#ifdef HAVE_AFECONET
227	{	259	{
228	"econet", "ec", &flag_econet	260	"econet", "ec", &flag_econet
229	},	261	},
		262	#endif
		263	#ifdef HAVE_AFX25
230	{	264	{
231	"x25", "x25", &flag_x25	265	"x25", "x25", &flag_x25
232	},	266	},
		267	#endif
		268	#ifdef HAVE_AFASH
233	{	269	{
234	"ash", "ash", &flag_ash	270	"ash", "ash", &flag_ash
235	},	271	},
		272	#endif
236	{	273	{
237	0, 0, 0	274	0, 0, 0
238	}	275	}
@@ -694,7 +731,7 @@ static int aftrans_opt(const char *arg)
694		731
695	while (tmp1) {	732	while (tmp1) {
696		733
697	tmp2 = index(tmp1, ',');	734	tmp2 = strchr(tmp1, ',');
698		735
699	if (tmp2)	736	if (tmp2)
700	*(tmp2++) = '\0';	737	*(tmp2++) = '\0';
@@ -777,7 +814,7 @@ static struct aftype get_aftype(const char name)
777	return (*afp);	814	return (*afp);
778	afp++;	815	afp++;
779	}	816	}
780	if (index(name, ','))	817	if (strchr(name, ','))
781	fprintf(stderr, _("Please don't supply more than one address family.\n"));	818	fprintf(stderr, _("Please don't supply more than one address family.\n"));
782	return (NULL);	819	return (NULL);
783	}	820	}


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);
92	int is_directory(const char name, int followLinks, struct stat statBuf);	92	int is_directory(const char name, int followLinks, struct stat statBuf);
93	int isDevice(const char *name);	93	int isDevice(const char *name);
94		94
95	typedef struct ino_dev_hash_bucket_struct {
96	struct ino_dev_hash_bucket_struct *next;
97	ino_t ino;
98	dev_t dev;
99	char name[1];
100	} ino_dev_hashtable_bucket_t;
101	int is_in_ino_dev_hashtable(const struct stat statbuf, char *name);
102	void add_to_ino_dev_hashtable(const struct stat statbuf, const char name);
103	void reset_ino_dev_hashtable(void);
104
105	int remove_file(const char *path, int flags);	95	int remove_file(const char *path, int flags);
106	int copy_file(const char source, const char dest, int flags);	96	int copy_file(const char source, const char dest, int flags);
107	int copy_file_chunk(FILE src_file, FILE dst_file, unsigned long long chunksize);	97	int copy_file_chunk(FILE src_file, FILE dst_file, unsigned long long chunksize);