From: <st...@us...> - 2009-01-27 09:22:29
|
Revision: 3596 http://hugin.svn.sourceforge.net/hugin/?rev=3596&view=rev Author: stativ Date: 2009-01-27 09:22:27 +0000 (Tue, 27 Jan 2009) Log Message: ----------- Escape # and : in makefile. Fixes bugs 2106362, 2005561. Modified Paths: -------------- hugin/trunk/src/hugin_base/hugin_utils/platform.h Modified: hugin/trunk/src/hugin_base/hugin_utils/platform.h =================================================================== --- hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-01-27 07:56:03 UTC (rev 3595) +++ hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-01-27 09:22:27 UTC (rev 3596) @@ -110,6 +110,9 @@ * some important shell chars I don't know of. * This could lead to nasty behaviour and maybe * even security holes. + * + * Note that : is not special shell charater but it should be + * escaped because it causes problems with gnumake. */ template <class str> str quoteStringShell(const str & arg) @@ -117,20 +120,19 @@ #ifdef WIN32 // Do not quote backslash and ~ on win32. // It seems to be handled well by sh.exe from unixutils - return quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()")); + return quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#:")); #else - return quoteStringInternal(arg, str("\\"), str("\\ ~$\"|'`{}[]()")); + return quoteStringInternal(arg, str("\\"), str("\\ ~$\"|'`{}[]()*#:")); #endif } /** Escape dangerous chars in makefile strings/filenames - * (space), should quote : as well, but it does not - * seem to be supported by make. + * (space),#,: */ template <class str> str escapeStringMake(const str & arg) { - return quoteStringInternal(arg, str("\\"), str(" ")); + return quoteStringInternal(arg, str("\\"), str(" #:")); } /** Quote a filename, so that it is surrounded by "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-01-30 15:37:46
|
Revision: 3607 http://hugin.svn.sourceforge.net/hugin/?rev=3607&view=rev Author: stativ Date: 2009-01-30 15:37:36 +0000 (Fri, 30 Jan 2009) Log Message: ----------- Escape = in paths in makefile. Modified Paths: -------------- hugin/trunk/src/hugin_base/hugin_utils/platform.h Modified: hugin/trunk/src/hugin_base/hugin_utils/platform.h =================================================================== --- hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-01-30 13:27:43 UTC (rev 3606) +++ hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-01-30 15:37:36 UTC (rev 3607) @@ -111,8 +111,8 @@ * This could lead to nasty behaviour and maybe * even security holes. * - * Note that : is not special shell charater but it should be - * escaped because it causes problems with gnumake. + * Note that : and = are not special shell charaters but they also + * should be escaped because they causes problems with gnumake. */ template <class str> str quoteStringShell(const str & arg) @@ -120,19 +120,19 @@ #ifdef WIN32 // Do not quote backslash and ~ on win32. // It seems to be handled well by sh.exe from unixutils - return quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#:")); + return quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#:=")); #else - return quoteStringInternal(arg, str("\\"), str("\\ ~$\"|'`{}[]()*#:")); + return quoteStringInternal(arg, str("\\"), str("\\ ~$\"|'`{}[]()*#:=")); #endif } /** Escape dangerous chars in makefile strings/filenames - * (space),#,: + * (space),#,:,= */ template <class str> str escapeStringMake(const str & arg) { - return quoteStringInternal(arg, str("\\"), str(" #:")); + return quoteStringInternal(arg, str("\\"), str(" #:=")); } /** Quote a filename, so that it is surrounded by "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-01-30 17:12:13
|
Revision: 3608 http://hugin.svn.sourceforge.net/hugin/?rev=3608&view=rev Author: stativ Date: 2009-01-30 17:12:09 +0000 (Fri, 30 Jan 2009) Log Message: ----------- Escape dolar sign ($) in a right way. Fixes bug #2462061. Modified Paths: -------------- hugin/trunk/src/hugin_base/hugin_utils/platform.h Modified: hugin/trunk/src/hugin_base/hugin_utils/platform.h =================================================================== --- hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-01-30 15:37:36 UTC (rev 3607) +++ hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-01-30 17:12:09 UTC (rev 3608) @@ -120,9 +120,9 @@ #ifdef WIN32 // Do not quote backslash and ~ on win32. // It seems to be handled well by sh.exe from unixutils - return quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#:=")); + return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#:=")), str("$"), str("$")); #else - return quoteStringInternal(arg, str("\\"), str("\\ ~$\"|'`{}[]()*#:=")); + return quoteStringInternal(quoteStringInternal(arg, str("\\"), str("\\ ~$\"|'`{}[]()*#:=")), str("$"), str("$")); #endif } @@ -132,7 +132,7 @@ template <class str> str escapeStringMake(const str & arg) { - return quoteStringInternal(arg, str("\\"), str(" #:=")); + return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" #:=")), str("$"), str("$")); } /** Quote a filename, so that it is surrounded by "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-02-11 12:45:25
|
Revision: 3640 http://hugin.svn.sourceforge.net/hugin/?rev=3640&view=rev Author: stativ Date: 2009-02-11 12:45:16 +0000 (Wed, 11 Feb 2009) Log Message: ----------- Second part to the previous fix. Also do not escape colon in escapeStringMake() in Windows as it breaks use of absolute pathnames and it's not neccessary as : is not allowed to use in filename. Modified Paths: -------------- hugin/trunk/src/hugin_base/hugin_utils/platform.h Modified: hugin/trunk/src/hugin_base/hugin_utils/platform.h =================================================================== --- hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-02-11 12:24:01 UTC (rev 3639) +++ hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-02-11 12:45:16 UTC (rev 3640) @@ -127,12 +127,17 @@ } /** Escape dangerous chars in makefile strings/filenames - * (space),#,:,= + * (space),#,= */ template <class str> str escapeStringMake(const str & arg) { +#ifdef WIN32 + // Do not escape colon in windows because it causes problems with absolute paths + return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" #=")), str("$"), str("$")); +#else return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" #:=")), str("$"), str("$")); +#endif } /** Quote a filename, so that it is surrounded by "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-02-11 12:55:52
|
Revision: 3639 http://hugin.svn.sourceforge.net/hugin/?rev=3639&view=rev Author: stativ Date: 2009-02-11 12:24:01 +0000 (Wed, 11 Feb 2009) Log Message: ----------- Fix problem with makefile when absolute paths are used. Modified Paths: -------------- hugin/trunk/src/hugin_base/hugin_utils/platform.h Modified: hugin/trunk/src/hugin_base/hugin_utils/platform.h =================================================================== --- hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-02-10 23:33:45 UTC (rev 3638) +++ hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-02-11 12:24:01 UTC (rev 3639) @@ -118,9 +118,9 @@ str quoteStringShell(const str & arg) { #ifdef WIN32 - // Do not quote backslash and ~ on win32. + // Do not quote backslash,: and ~ on win32. // It seems to be handled well by sh.exe from unixutils - return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#:=")), str("$"), str("$")); + return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#=")), str("$"), str("$")); #else return quoteStringInternal(quoteStringInternal(arg, str("\\"), str("\\ ~$\"|'`{}[]()*#:=")), str("$"), str("$")); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-02-12 11:01:36
|
Revision: 3643 http://hugin.svn.sourceforge.net/hugin/?rev=3643&view=rev Author: stativ Date: 2009-02-12 11:01:32 +0000 (Thu, 12 Feb 2009) Log Message: ----------- Escape ^ in makefile on Windows. Even thought it's not necessary make interprets \^ as ^ which causes problems with folders starting with ^. Modified Paths: -------------- hugin/trunk/src/hugin_base/hugin_utils/platform.h Modified: hugin/trunk/src/hugin_base/hugin_utils/platform.h =================================================================== --- hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-02-12 00:33:04 UTC (rev 3642) +++ hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-02-12 11:01:32 UTC (rev 3643) @@ -120,7 +120,8 @@ #ifdef WIN32 // Do not quote backslash,: and ~ on win32. // It seems to be handled well by sh.exe from unixutils - return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#=")), str("$"), str("$")); + // Escape ^. It shouldn't be necessary, but otherwise folders starting with ^ will not work + return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#=^")), str("$"), str("$")); #else return quoteStringInternal(quoteStringInternal(arg, str("\\"), str("\\ ~$\"|'`{}[]()*#:=")), str("$"), str("$")); #endif @@ -134,7 +135,8 @@ { #ifdef WIN32 // Do not escape colon in windows because it causes problems with absolute paths - return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" #=")), str("$"), str("$")); + // Escape ^. It shouldn't be necessary, but otherwise folders starting with ^ will not work + return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" #=^")), str("$"), str("$")); #else return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" #:=")), str("$"), str("$")); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-03-26 15:28:32
|
Revision: 3760 http://hugin.svn.sourceforge.net/hugin/?rev=3760&view=rev Author: stativ Date: 2009-03-26 15:28:20 +0000 (Thu, 26 Mar 2009) Log Message: ----------- small whitespace change Modified Paths: -------------- hugin/trunk/src/hugin_base/hugin_utils/platform.h Modified: hugin/trunk/src/hugin_base/hugin_utils/platform.h =================================================================== --- hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-03-26 00:02:41 UTC (rev 3759) +++ hugin/trunk/src/hugin_base/hugin_utils/platform.h 2009-03-26 15:28:20 UTC (rev 3760) @@ -120,7 +120,7 @@ #ifdef WIN32 // Do not quote backslash,: and ~ on win32. // It seems to be handled well by sh.exe from unixutils - // Escape ^. It shouldn't be necessary, but otherwise folders starting with ^ will not work + // Escape ^. It shouldn't be necessary, but otherwise folders starting with ^ will not work return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" $\"|'`{}[]()*#=^")), str("$"), str("$")); #else return quoteStringInternal(quoteStringInternal(arg, str("\\"), str("\\ ~$\"|'`{}[]()*#:=")), str("$"), str("$")); @@ -135,7 +135,7 @@ { #ifdef WIN32 // Do not escape colon in windows because it causes problems with absolute paths - // Escape ^. It shouldn't be necessary, but otherwise folders starting with ^ will not work + // Escape ^. It shouldn't be necessary, but otherwise folders starting with ^ will not work return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" #=^")), str("$"), str("$")); #else return quoteStringInternal(quoteStringInternal(arg, str("\\"), str(" #:=")), str("$"), str("$")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |