Move readlink, mktemp, run-parts and which to a new debianutils dir.

author: Glenn L McGrath <bug1@ihug.co.nz> 2002-11-11 03:00:12 +0000
committer: Glenn L McGrath <bug1@ihug.co.nz> 2002-11-11 03:00:12 +0000
commit: 8f0722a53b9a88c0b4e60b79e4362d0f31c32c54 (patch)
tree: 2efbea745d3ef22e375df3e60ba4c8f14c04f1c4 /findutils
parent: c11986d89eba564945b226660031e624bf897561 (diff)
download: busybox-w32-8f0722a53b9a88c0b4e60b79e4362d0f31c32c54.tar.gz
busybox-w32-8f0722a53b9a88c0b4e60b79e4362d0f31c32c54.tar.bz2
busybox-w32-8f0722a53b9a88c0b4e60b79e4362d0f31c32c54.zip
3 files changed, 0 insertions, 83 deletions
diff --git a/findutils/Makefile.in b/findutils/Makefile.in
index 2deaadb05..4133d1c3f 100644
--- a/findutils/Makefile.in
+++ b/findutils/Makefile.in
@@ -25,7 +25,6 @@ endif
 FINDUTILS-y:=
 FINDUTILS-$(CONFIG_FIND)        += find.o
 FINDUTILS-$(CONFIG_GREP)        += grep.o
-FINDUTILS-$(CONFIG_WHICH)       += which.o
 FINDUTILS-$(CONFIG_XARGS)       += xargs.o
 libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR)
diff --git a/findutils/config.in b/findutils/config.in
index d5a3714d2..41a23c00a 100644
--- a/findutils/config.in
+++ b/findutils/config.in
@@ -18,7 +18,6 @@ if [ "$CONFIG_GREP" = "y" ] ; then
    bool '  Support extended regular expressions (egrep & grep -E)'             CONFIG_FEATURE_GREP_EGREP_ALIAS
    bool '  Enable before and after context flags (-A, -B and -C)'      CONFIG_FEATURE_GREP_CONTEXT
 fi
-bool 'which'        CONFIG_WHICH
 bool 'xargs'        CONFIG_XARGS
 endmenu
diff --git a/findutils/which.c b/findutils/which.c
deleted file mode 100644
index b2af5a8ea..000000000
--- a/findutils/which.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Which implementation for busybox
- *
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
- *
- * 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
- *
- */
-/* getopt not needed */
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "busybox.h"
-extern int which_main(int argc, char **argv)
-{
-        char *path_list, *path_n;
-        struct stat filestat;
-        int i, count=1, found, status = EXIT_SUCCESS;
-        if (argc <= 1 || **(argv + 1) == '-')
-                show_usage();
-        argc--;
-        path_list = getenv("PATH");
-        if (path_list != NULL) {
-                for(i=strlen(path_list); i > 0; i--)
-                        if (path_list[i]==':') {
-                                path_list[i]=0;
-                                count++;
-                        }
-        } else {
-                path_list = "/bin\0/sbin\0/usr/bin\0/usr/sbin\0/usr/local/bin";
-                count = 5;
-        }
-        while(argc-- > 0) { 
-                path_n = path_list;
-                argv++;
-                found = 0;
-                for (i = 0; i < count; i++) {
-                        char *buf;
-                        buf = concat_path_file(path_n, *argv);
-                        if (stat (buf, &filestat) == 0
-                            && filestat.st_mode & S_IXUSR)
-                        {
-                                puts(buf);
-                                found = 1;
-                                break;
-                        }
-                        free(buf);
-                        path_n += (strlen(path_n) + 1);
-                }
-                if (!found)
-                        status = EXIT_FAILURE;
-        }
-        return status;
-}
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
author	Glenn L McGrath <bug1@ihug.co.nz>	2002-11-11 03:00:12 +0000
committer	Glenn L McGrath <bug1@ihug.co.nz>	2002-11-11 03:00:12 +0000
commit	8f0722a53b9a88c0b4e60b79e4362d0f31c32c54 (patch)
tree	2efbea745d3ef22e375df3e60ba4c8f14c04f1c4 /findutils
parent	c11986d89eba564945b226660031e624bf897561 (diff)
download	busybox-w32-8f0722a53b9a88c0b4e60b79e4362d0f31c32c54.tar.gz busybox-w32-8f0722a53b9a88c0b4e60b79e4362d0f31c32c54.tar.bz2 busybox-w32-8f0722a53b9a88c0b4e60b79e4362d0f31c32c54.zip

diff --git a/findutils/Makefile.in b/findutils/Makefile.in index 2deaadb05..4133d1c3f 100644 --- a/findutils/Makefile.in +++ b/findutils/Makefile.in
@@ -25,7 +25,6 @@ endif
25	FINDUTILS-y:=	25	FINDUTILS-y:=
26	FINDUTILS-$(CONFIG_FIND) += find.o	26	FINDUTILS-$(CONFIG_FIND) += find.o
27	FINDUTILS-$(CONFIG_GREP) += grep.o	27	FINDUTILS-$(CONFIG_GREP) += grep.o
28	FINDUTILS-$(CONFIG_WHICH) += which.o
29	FINDUTILS-$(CONFIG_XARGS) += xargs.o	28	FINDUTILS-$(CONFIG_XARGS) += xargs.o
30		29
31	libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR)	30	libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR)


diff --git a/findutils/config.in b/findutils/config.in index d5a3714d2..41a23c00a 100644 --- a/findutils/config.in +++ b/findutils/config.in
@@ -18,7 +18,6 @@ if [ "$CONFIG_GREP" = "y" ] ; then
18	bool ' Support extended regular expressions (egrep & grep -E)' CONFIG_FEATURE_GREP_EGREP_ALIAS	18	bool ' Support extended regular expressions (egrep & grep -E)' CONFIG_FEATURE_GREP_EGREP_ALIAS
19	bool ' Enable before and after context flags (-A, -B and -C)' CONFIG_FEATURE_GREP_CONTEXT	19	bool ' Enable before and after context flags (-A, -B and -C)' CONFIG_FEATURE_GREP_CONTEXT
20	fi	20	fi
21	bool 'which' CONFIG_WHICH
22	bool 'xargs' CONFIG_XARGS	21	bool 'xargs' CONFIG_XARGS
23	endmenu	22	endmenu
24		23


diff --git a/findutils/which.c b/findutils/which.c deleted file mode 100644 index b2af5a8ea..000000000 --- a/findutils/which.c +++ /dev/null
@@ -1,81 +0,0 @@
1	/* vi: set sw=4 ts=4: */
2	/*
3	* Which implementation for busybox
4	*
5	* Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
6	* Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
7	*
8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.
12	*
13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16	* General Public License for more details.
17	*
18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software
20	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21	*
22	*/
23
24	/* getopt not needed */
25	#include <string.h>
26	#include <stdio.h>
27	#include <stdlib.h>
28	#include "busybox.h"
29
30	extern int which_main(int argc, char **argv)
31	{
32	char path_list, path_n;
33	struct stat filestat;
34	int i, count=1, found, status = EXIT_SUCCESS;
35
36	if (argc <= 1 \|\| **(argv + 1) == '-')
37	show_usage();
38	argc--;
39
40	path_list = getenv("PATH");
41	if (path_list != NULL) {
42	for(i=strlen(path_list); i > 0; i--)
43	if (path_list[i]==':') {
44	path_list[i]=0;
45	count++;
46	}
47	} else {
48	path_list = "/bin\0/sbin\0/usr/bin\0/usr/sbin\0/usr/local/bin";
49	count = 5;
50	}
51
52	while(argc-- > 0) {
53	path_n = path_list;
54	argv++;
55	found = 0;
56	for (i = 0; i < count; i++) {
57	char *buf;
58	buf = concat_path_file(path_n, *argv);
59	if (stat (buf, &filestat) == 0
60	&& filestat.st_mode & S_IXUSR)
61	{
62	puts(buf);
63	found = 1;
64	break;
65	}
66	free(buf);
67	path_n += (strlen(path_n) + 1);
68	}
69	if (!found)
70	status = EXIT_FAILURE;
71	}
72	return status;
73	}
74
75	/*
76	Local Variables:
77	c-file-style: "linux"
78	c-basic-offset: 4
79	tab-width: 4
80	End:
81	*/