dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

more of patch #1055553 - Absolute path of *.nsi not accepted on posix (-- separator between options and files for posix)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3770 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-11-19 13:45:22 +00:00
parent 93338d986c
commit 1e93f9983f
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/makenssi.cpp
View file

@ -90,6 +90,9 @@ int main(int argc, char **argv)
FILE *fp; FILE *fp;
int tmpargpos=1; int tmpargpos=1;
int no_logo=0; int no_logo=0;
#ifndef _WIN32
int in_files=0;
#endif
build.setdirs(argv[0]); build.setdirs(argv[0]);
@ -136,7 +139,13 @@ int main(int argc, char **argv)
if (!g_output) g_output=stdout; if (!g_output) g_output=stdout;
while (argpos < argc) while (argpos < argc)
{ {
#ifndef _WIN32
if (!strcmp(argv[argpos], "--"))
in_files=1;
else if (argv[argpos][0] == OPT_C && strcmp(argv[argpos], "-") && !in_files)
#else
if (argv[argpos][0] == OPT_C && strcmp(argv[argpos], "-")) if (argv[argpos][0] == OPT_C && strcmp(argv[argpos], "-"))
#endif
{ {
if ((argv[argpos][1]=='D' || argv[argpos][1]=='d') && argv[argpos][2]) if ((argv[argpos][1]=='D' || argv[argpos][1]=='d') && argv[argpos][2])
{ {
@ -260,7 +269,12 @@ int main(int argc, char **argv)
else else
{ {
files_processed++; files_processed++;
if (!strcmp(argv[argpos],"-")) g_dopause=0; #ifndef _WIN32
if (!strcmp(argv[argpos],"-") && !in_files)
#else
if (!strcmp(argv[argpos],"-"))
#endif
g_dopause=0;
if (!g_noconfig) if (!g_noconfig)
{ {
g_noconfig=1; g_noconfig=1;
@ -301,7 +315,11 @@ int main(int argc, char **argv)
{ {
char sfile[1024]; char sfile[1024];
#ifndef _WIN32
if (!strcmp(argv[argpos],"-") && !in_files)
#else
if (!strcmp(argv[argpos],"-")) if (!strcmp(argv[argpos],"-"))
#endif
{ {
fp=stdin; fp=stdin;
strcpy(sfile,"stdin"); strcpy(sfile,"stdin");