aboutsummaryrefslogtreecommitdiff
path: root/src/functionfilesin.cpp
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2006-09-20 20:44:16 +0000
committerMike Buland <eichlan@xagasoft.com>2006-09-20 20:44:16 +0000
commit030ab69b236f53357a79fa912956f43f975d79e2 (patch)
tree322a859f16f13ce35e200b0f29a2553df8d07a25 /src/functionfilesin.cpp
parent4ea12e162a40e43faae99225386aedb8a0b9f1c4 (diff)
downloadbuild-030ab69b236f53357a79fa912956f43f975d79e2.tar.gz
build-030ab69b236f53357a79fa912956f43f975d79e2.tar.bz2
build-030ab69b236f53357a79fa912956f43f975d79e2.tar.xz
build-030ab69b236f53357a79fa912956f43f975d79e2.zip
Updated these two functions, they now work exactly how they should.
Diffstat (limited to '')
-rw-r--r--src/functionfilesin.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/functionfilesin.cpp b/src/functionfilesin.cpp
index e1a4c2b..9b9187d 100644
--- a/src/functionfilesin.cpp
+++ b/src/functionfilesin.cpp
@@ -25,7 +25,17 @@ void FunctionFilesIn::execute( Build *bld, const StringList &lInput, StringList
25 25
26 struct dirent *e; 26 struct dirent *e;
27 27
28 std::string prefix = lParams.front() + "/"; 28 std::string prefix;
29 if( lParams.size() >= 2 )
30 {
31 StringList::iterator i = lParams.begin();
32 i++;
33 prefix = *i;
34 }
35 else
36 {
37 prefix = lParams.front() + "/";
38 }
29 39
30 while( (e = readdir( d )) ) 40 while( (e = readdir( d )) )
31 { 41 {