mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-08 11:40:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

initialize.c: Do not get Unicode command line if Unicode support not activated.

Browse Source 
2009-04-17  Pascal Obry  <obry@adacore.com>

	* initialize.c: Do not get Unicode command line if Unicode support not
	activated.
	Add support for wildcard expansion for Unicode parameters on Win32.

	* mingw32.h: Add missing macros when Unicode support not activated.

From-SVN: r146258
This commit is contained in:
Pascal Obry 2009-04-17 12:33:07 +00:00 committed by Arnaud Charlet
parent fabf2749fd
commit 46e26fe337
3 changed files with 103 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ada/ChangeLog
View File

@ -1,3 +1,11 @@
2009-04-17 Pascal Obry <obry@adacore.com>
* initialize.c: Do not get Unicode command line if Unicode support not
activated.
Add support for wildcard expansion for Unicode parameters on Win32.
* mingw32.h: Add missing macros when Unicode support not activated.
2009-04-17 Javier Miranda <miranda@adacore.com>
* sem_ch6.adb (Check_Anonymous_Return): Add missing checks to

104
gcc/ada/initialize.c
View File

@ -72,6 +72,52 @@ extern char **gnat_argv;
extern void __gnat_plist_init (void);
#endif
#ifdef GNAT_UNICODE_SUPPORT
#define EXPAND_ARGV_RATE 128
static void
append_arg (int *index, LPWSTR value, char ***argv, int *last)
{
int size;
if (*last < *index)
{
char **old_argv = *argv;
int old_last = *last;
int k;
*last += EXPAND_ARGV_RATE;
*argv = (char **) xmalloc ((*last) * sizeof (char *));
for (k=0; k<=old_last; k++)
(*argv)[k] = old_argv[k];
free (old_argv);
}
size = WS2SC (NULL, value, 0);
(*argv)[*index] = (char *) xmalloc (size + 1);
WS2SC ((*argv)[*index], value, size);
(*index)++;
}
static void
adjust_arg (int last, char ***argv)
{
char **old_argv = *argv;
int k;
*argv = (char **) xmalloc (last * sizeof (char *));
for (k=0; k<last; k++)
(*argv)[k] = old_argv[k];
free (old_argv);
}
#endif
void
__gnat_initialize (void *eh)
{
@ -91,37 +137,73 @@ __gnat_initialize (void *eh)
if (codepage != NULL)
if (strcmp (codepage, "CP_ACP") == 0)
CurrentCodePage = CP_ACP;
CurrentCodePage = CP_ACP;
else if (strcmp (codepage, "CP_UTF8") == 0)
CurrentCodePage = CP_UTF8;
CurrentCodePage = CP_UTF8;
}
#endif
/* Adjust gnat_argv to support Unicode characters. */
{
LPWSTR *wargv;
int wargc;
int k;
int size;
int last;
int argc_expanded = 0;
TCHAR result [MAX_PATH];
wargv = CommandLineToArgvW (GetCommandLineW(), &wargc);
if (wargv != NULL)
{
/* Set gnat_argv with arguments encoded in UTF-8. */
gnat_argv = (char **) xmalloc ((wargc + 1) * sizeof (char *));
last = wargc + 1;
gnat_argv = (char **) xmalloc ((last) * sizeof (char *));
for (k=0; k<wargc; k++)
/* argv[0] is the executable full path-name. */
SearchPath (NULL, wargv[0], _T(".exe"), MAX_PATH, result, NULL);
append_arg (&argc_expanded, result, &gnat_argv, &last);
for (k=1; k<wargc; k++)
{
size = WS2SC (NULL, wargv[k], 0);
gnat_argv[k] = (char *) xmalloc (size + 1);
WS2SC (gnat_argv[k], wargv[k], size);
/* Check for wildcard expansion. */
if (_tcsstr (wargv[k], _T("?")) != 0 ||
_tcsstr (wargv[k], _T("*")) != 0)
{
/* Wilcards are present, append all corresponding matches. */
WIN32_FIND_DATA FileData;
HANDLE hDir = FindFirstFile (wargv[k], &FileData);
if (hDir == INVALID_HANDLE_VALUE)
{
/* No match, append arg as-is. */
append_arg (&argc_expanded, wargv[k], &gnat_argv, &last);
}
else
{
/* Append first match and all remaining ones. */
do {
append_arg (&argc_expanded,
FileData.cFileName, &gnat_argv, &last);
} while (FindNextFile (hDir, &FileData));
FindClose (hDir);
}
}
else
{
/* No wildcard. Store parameter as-is. */
append_arg (&argc_expanded, wargv[k], &gnat_argv, &last);
}
}
LocalFree (wargv);
gnat_argc = wargc;
gnat_argc = argc_expanded;
adjust_arg (argc_expanded, &gnat_argv);
}
}
}
#endif
/* Note that we do not activate this for the compiler itself to avoid a
bootstrap path problem. Older version of gnatbind will generate a call

2
gcc/ada/mingw32.h
View File

@ -93,6 +93,8 @@ extern UINT CurrentCodePage;
#define WS2S(str,wstr,len) \
WideCharToMultiByte (CP_ACP,0,wstr,-1,str,len,NULL,NULL)
#else
#define S2WSC(wstr,str,len) strncpy(wstr,str,len)
#define WS2SC(str,wstr,len) strncpy(str,wstr,len)
#define S2WSU(wstr,str,len) strncpy(wstr,str,len)
#define WS2SU(str,wstr,len) strncpy(str,wstr,len)
#define S2WS(wstr,str,len) strncpy(wstr,str,len)