From b3308d1d7fa956e98e3ee53f119b083ebb612765 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Wed, 30 Apr 2003 12:20:03 +0000
Subject: [PATCH] Two File /r commands should work again

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2513 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/build.h    |  2 +-
 Source/script.cpp | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Source/build.h b/Source/build.h
index 42672442..043bea74 100644
--- a/Source/build.h
+++ b/Source/build.h
@@ -94,7 +94,7 @@ class CEXEBuild {
     void ps_addtoline(const char *str, GrowBuf &linedata, StringList &hist);
     int doParse(const char *str, FILE *fp, const char *curfilename, int *lineptr);
     int doCommand(int which_token, LineParser &line, FILE *fp, const char *curfilename, int *lineptr);
-    int do_add_file(const char *lgss, int attrib, int recurse, int linecnt, int *total_files, const char *name_override=0, int generatecode=1, int *data_handle=0);
+    int do_add_file(const char *lgss, int attrib, int recurse, int linecnt, int *total_files, const char *name_override=0, int generatecode=1, int *data_handle=0, int rec_depth=0);
     GrowBuf m_linebuild; // used for concatenating lines
 
     void ERROR_MSG(const char *s, ...);
diff --git a/Source/script.cpp b/Source/script.cpp
index ea670d58..22afa859 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -4359,7 +4359,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
 }
 
 #ifdef NSIS_SUPPORT_FILE
-int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int linecnt, int *total_files, const char *name_override, int generatecode, int *data_handle)
+int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int linecnt, int *total_files, const char *name_override, int generatecode, int *data_handle, int rec_depth)
 {
   char dir[1024];
   char newfn[1024];
@@ -4530,9 +4530,6 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int linecn
 
   if (recurse)
   {
-    static int counter;
-    int thiscounter=counter++;
-
     int a=GetFileAttributes(lgss);
     const char *fspec=lgss+strlen(dir)+!!dir[0];
     strcpy(newfn,lgss);
@@ -4544,7 +4541,7 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int linecn
     else
     {
       // we don't want to include a whole directory if it's not the first call
-      if (thiscounter) return PS_OK;
+      if (rec_depth) return PS_OK;
       fspec="*.*";
     }
     if (a&FILE_ATTRIBUTE_DIRECTORY)
@@ -4624,7 +4621,7 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int linecn
                   }
                 }
               }
-              a=do_add_file(spec,attrib,recurse,linecnt,total_files,NULL,generatecode);
+              a=do_add_file(spec,attrib,recurse,linecnt,total_files,NULL,generatecode,data_handle,rec_depth+1);
               if (a != PS_OK)
               {
                 FindClose(h);
@@ -4638,7 +4635,7 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int linecn
         } while (FindNextFile(h,&d));
         FindClose(h);
 
-        if (!thiscounter)
+        if (!rec_depth)
         {
           entry ent={0,};
           ent.which=EW_CREATEDIR;