Re: directry name problem? bin is not correctry recognized on windows in some cases

[Petr M. <mi...@ph...>]

> The directory  constitution is 
> 
> gnuplot/bin/wgnuplot.exe
> gnuplot/bin/wgnuplot_pipes.exe
> gnuplot/bin/gnuplot.exe
>        :
> gnuplot/bin/share/PostScript/(8859-1.ps etc.)
> gnuplot/bin/share/js/(canvasmath.js etc.)
> gnuplot/bin/share/lua/share/lua/(gnuplot-tikz.lua etc.)
> gnuplot/bin/etc/fonts/fonts.conf
> 
> If I just rename 'bin' to 'binaries', everything works as expected.
> 
> The other change that works
> gnuplot/bin/wgnuplot.exe
> gnuplot/bin/wgnuplot_pipes.exe
> gnuplot/bin/gnuplot.exe
>        :
> gnuplot/share/PostScript/(8859-1.ps etc.)
> gnuplot/share/share/js/(canvasmath.js etc.)
> gnuplot/share/lua/share/lua/(gnuplot-tikz.lua etc.)
> gnuplot/etc/fonts/fonts.conf
> 
> The second is standard unixy directory constitution.
> In this case, everything works correctly.

Grepping for "bin", here seems to be the reason:

winmain.c, line 316 (in function main() / WinMain()):

	if (_fstrlen(szModuleName) >= 5 && 
_fstrnicmp(&szModuleName[_fstrlen(szModuleName)-5], "\\bin\\", 5) == 0)
	{
		int len = _fstrlen(szModuleName)-4;
		szPackageDir = (LPSTR)farmalloc(len+1);
		CheckMemory(szPackageDir);
		_fstrncpy(szPackageDir, szModuleName, len);
		szPackageDir[len] = '\0';
	}
	else
		szPackageDir = szModuleName;

So this "unixish" behaviour is intentional, see ChangeLog:

2008-10-11  Michael Goffioul  <mic...@gm...>

* src/win/winmain.h src/win/winmain.c (WinMain): Compute new variable
szPackageDir from szModuleName, stripping possible "\bin\" at the end.

* term/post.trm (PS_open_prologue_file): Use szPackageDir instead of
szModuleName.


=> I will rename "bin" directory in gp44rc1win32.zip to "binary".

---
PM