aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2001-05-04 22:04:24 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2001-05-04 22:04:24 +0000
commit044a72d0d50bb7380601232d1388453f01fff622 (patch)
tree18212b9982894cbb0bafa7a675e9cc7f0fa6e3c3 /findutils
parenta0ba9f45fb0c9f3e34d5a2b25e45b7e5d5cac9a4 (diff)
downloadbusybox-044a72d0d50bb7380601232d1388453f01fff622.tar.gz
busybox-044a72d0d50bb7380601232d1388453f01fff622.tar.bz2
Larry suggested using concat_path_file() would be an even safer bet
for 'which'. I ageed, so I whipped this up -- which revealed a bug in concat_path_file. It turns out that that a '/' can be appended from either the path _or_ the filename, but only the former was checked. -Erik
Diffstat (limited to 'findutils')
-rw-r--r--findutils/which.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/findutils/which.c b/findutils/which.c
index 08813c149..1e5e9eed5 100644
--- a/findutils/which.c
+++ b/findutils/which.c
@@ -53,10 +53,9 @@ extern int which_main(int argc, char **argv)
argv++;
found = 0;
for (i = 0; i < count; i++) {
- char buf[strlen(path_n)+strlen(*argv)+2];
- strcpy (buf, path_n);
- strcat (buf, "/");
- strcat (buf, *argv);
+ char *buf;
+ buf = concat_path_file(buf, path_n);
+ buf = concat_path_file(buf, *argv);
if (stat (buf, &filestat) == 0
&& filestat.st_mode & S_IXUSR)
{