From d73088e9124608c264aa6ab5e1676d0e02b959d9 Mon Sep 17 00:00:00 2001 From: justin1014 Date: Fri, 13 Sep 2002 21:25:03 +0000 Subject: [PATCH] forgot to have it skip the STR: :) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1008 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/script.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Source/script.cpp b/Source/script.cpp index afea0b01..f24ac6d2 100644 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -2297,13 +2297,21 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char } } - if (!strncmp(line.gettoken_str(3),"STR:",4)) ent.offsets[5]|=1; - if (!strncmp(line.gettoken_str(4),"STR:",4)) ent.offsets[5]|=2; + if (!strncmp(line.gettoken_str(3),"STR:",4)) + { + ent.offsets[5]|=1; + ent.offsets[3]=add_string(line.gettoken_str(3)+4); + } + else ent.offsets[3]=add_string(line.gettoken_str(3)); + if (!strncmp(line.gettoken_str(4),"STR:",4)) + { + ent.offsets[5]|=2; + ent.offsets[4]=add_string(line.gettoken_str(4)+4); + } + else ent.offsets[4]=add_string(line.gettoken_str(4)); ent.offsets[1]=add_string(line.gettoken_str(1)); ent.offsets[2]=add_string(line.gettoken_str(2)); - ent.offsets[3]=add_string(line.gettoken_str(3)); - ent.offsets[4]=add_string(line.gettoken_str(4)); SCRIPT_MSG("(%s,%s,%s,%s)\n",line.gettoken_str(1),line.gettoken_str(2),line.gettoken_str(3),line.gettoken_str(4)); return add_entry(&ent);