Commit: c899902968d2a6d18c03600e013db86f3f659ace - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revisão: c899902968d2a6d18c03600e013db86f3f659ace (tree)
• Hora: 2013-05-08 23:34:32
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Mensagem de Log

Avoid unnecessary command line globbing in GUI applications.

Mudança Sumário

• modified: ChangeLog
• modified: src/guimain.cpp
• modified: src/guistub.cpp
• modified: src/rites.c

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Avoid unnecessary command line globbing in GUI applications.
+
+	* src/guimain.cpp src/guistub.cpp (_CRT_glob): Declare as extern "C";
+	initialise to zero, so overriding the runtime start-up default.
+
+	* src/rites.c [! IMPLEMENT_INITIATION_RITES] (_CRT_glob): Initialise
+	to zero here too; lastrites.exe doesn't need globbing either.
+
 2013-05-04  Keith Marshall  <[e-mail]>
 
 	Address some GCC-4.7 string initialisation warnings.

--- a/src/guimain.cpp
+++ b/src/guimain.cpp
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2012, MinGW Project
+ * Copyright (C) 2012, 2013, MinGW.org Project
  *
  *
  * Implementation of the WinMain() function, providing the program
@@ -34,6 +34,14 @@ using WTK::WindowClassMaker;
 using WTK::MainWindowMaker;
 using WTK::runtime_error;
 
+/* We've no use for command line arguments here, so disable globbing;
+ * note that this API must be declared 'extern "C"', but the compiler
+ * will complain if we declare as such, and initialise with a single
+ * statement, so we keep the two concepts separate.
+ */
+extern "C" int _CRT_glob;
+int _CRT_glob = 0;
+
 int APIENTRY WinMain
 ( HINSTANCE Instance, HINSTANCE PrevInstance, char *CmdLine, int ShowMode )
 {

--- a/src/guistub.cpp
+++ b/src/guistub.cpp
@@ -5,7 +5,7 @@
  *
  * Written by Keith Marshall <[e-mail]>
  * Derived from stub by Sze Howe Koh <[e-mail]>
- * Copyright (C) 2011, MinGW Project
+ * Copyright (C) 2011, 2013, MinGW.org Project
  *
  *
  * Implementation of the GUI main program function, which is invoked
@@ -31,6 +31,14 @@
  */
 #include <windows.h>
 
+/* We've no use for command line arguments here, so disable globbing;
+ * note that this API must be declared 'extern "C"', but the compiler
+ * will complain if we declare as such, and initialise with a single
+ * statement, so we keep the two concepts separate.
+ */
+extern "C" int _CRT_glob;
+int _CRT_glob = 0;
+
 int APIENTRY WinMain
 ( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
 {

--- a/src/rites.c
+++ b/src/rites.c
@@ -5,7 +5,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2009, 2010, 2012, MinGW.org Project
+ * Copyright (C) 2009, 2010, 2012, 2013, MinGW.org Project
  *
  *
  * Implementation of the main program function for the "lastrites.exe"
@@ -94,6 +94,12 @@
   * always report success.
   */
 # define END_RITES_IMPLEMENTATION	return EXIT_SUCCESS;
+
+/* We may note that this free-standing "main()" function doesn't
+ * process command line arguments, so we may disable globbing in
+ * the system runtime start-up code.
+ */
+int _CRT_glob = 0;
 #endif
 
 /* Provide selectors, to discriminate the two distinct classes