From 61ae6c590d2ea43a6d3a04b7b0c291ea36915134 Mon Sep 17 00:00:00 2001 From: kichik Date: Wed, 5 Jan 2005 16:36:05 +0000 Subject: [PATCH] better fix for bug #1096104 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3840 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/script.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Source/script.cpp b/Source/script.cpp index 609e2d1f..75cd2756 100644 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -5673,7 +5673,7 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int *total if (basedir == "") { new_dir = *dirs_itr; } else { - new_dir = basedir + PLATFORM_PATH_SEPARATOR_STR + *dirs_itr; + new_dir = basedir + '\\' + *dirs_itr; } string new_spec = dir + PLATFORM_PATH_SEPARATOR_STR + *dirs_itr + PLATFORM_PATH_SEPARATOR_STR; @@ -5938,14 +5938,6 @@ int CEXEBuild::do_add_file_create_dir(const string& local_dir, const string& dir pos = outdir_s.find('$', pos + 2); } -#ifndef _WIN32 - pos = outdir_s.find('/'); - while (pos != string::npos) { - outdir_s[pos] = '\\'; - pos = outdir_s.find('/'); - } -#endif - int outdir = add_string(outdir_s.c_str()); if (add_entry_direct(EW_CREATEDIR, outdir, 1) != PS_OK) {