Make child processes inherit command-line options through the
WINEOPTIONS environment variable.
This commit is contained in:
parent
b8774f95e5
commit
eeaae3cae9
154
misc/options.c
154
misc/options.c
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
@ -18,6 +19,7 @@ struct option
|
||||||
const char *longname;
|
const char *longname;
|
||||||
char shortname;
|
char shortname;
|
||||||
int has_arg;
|
int has_arg;
|
||||||
|
int inherit;
|
||||||
void (*func)( const char *arg );
|
void (*func)( const char *arg );
|
||||||
const char *usage;
|
const char *usage;
|
||||||
};
|
};
|
||||||
|
@ -41,6 +43,22 @@ struct options Options =
|
||||||
|
|
||||||
const char *argv0;
|
const char *argv0;
|
||||||
|
|
||||||
|
static char *inherit_str; /* options to pass to child processes */
|
||||||
|
|
||||||
|
static void out_of_memory(void) WINE_NORETURN;
|
||||||
|
static void out_of_memory(void)
|
||||||
|
{
|
||||||
|
MESSAGE( "Virtual memory exhausted\n" );
|
||||||
|
ExitProcess(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *xstrdup( const char *str )
|
||||||
|
{
|
||||||
|
char *ret = strdup( str );
|
||||||
|
if (!ret) out_of_memory();
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static void do_config( const char *arg );
|
static void do_config( const char *arg );
|
||||||
static void do_desktop( const char *arg );
|
static void do_desktop( const char *arg );
|
||||||
static void do_display( const char *arg );
|
static void do_display( const char *arg );
|
||||||
|
@ -52,30 +70,30 @@ static void do_version( const char *arg );
|
||||||
|
|
||||||
static const struct option option_table[] =
|
static const struct option option_table[] =
|
||||||
{
|
{
|
||||||
{ "config", 0, 1, do_config,
|
{ "config", 0, 1, 0, do_config,
|
||||||
"--config name Specify config file to use" },
|
"--config name Specify config file to use" },
|
||||||
{ "debugmsg", 0, 1, MAIN_ParseDebugOptions,
|
{ "debugmsg", 0, 1, 1, MAIN_ParseDebugOptions,
|
||||||
"--debugmsg name Turn debugging-messages on or off" },
|
"--debugmsg name Turn debugging-messages on or off" },
|
||||||
{ "desktop", 0, 1, do_desktop,
|
{ "desktop", 0, 1, 1, do_desktop,
|
||||||
"--desktop geom Use a desktop window of the given geometry" },
|
"--desktop geom Use a desktop window of the given geometry" },
|
||||||
{ "display", 0, 1, do_display,
|
{ "display", 0, 1, 0, do_display,
|
||||||
"--display name Use the specified display" },
|
"--display name Use the specified display" },
|
||||||
{ "dll", 0, 1, do_dll,
|
{ "dll", 0, 1, 1, do_dll,
|
||||||
"--dll name Enable or disable built-in DLLs" },
|
"--dll name Enable or disable built-in DLLs" },
|
||||||
{ "dosver", 0, 1, VERSION_ParseDosVersion,
|
{ "dosver", 0, 1, 1, VERSION_ParseDosVersion,
|
||||||
"--dosver x.xx DOS version to imitate (e.g. 6.22). Only valid with --winver win31" },
|
"--dosver x.xx DOS version to imitate (e.g. 6.22). Only valid with --winver win31" },
|
||||||
{ "help", 'h', 0, do_help,
|
{ "help", 'h', 0, 0, do_help,
|
||||||
"--help,-h Show this help message" },
|
"--help,-h Show this help message" },
|
||||||
{ "language", 0, 1, MAIN_ParseLanguageOption,
|
{ "language", 0, 1, 1, MAIN_ParseLanguageOption,
|
||||||
"--language xx Set the language (one of Br,Ca,Cs,Cy,Da,De,En,Eo,Es,Fi,Fr,Ga,Gd,Gv\n"
|
"--language xx Set the language (one of Br,Ca,Cs,Cy,Da,De,En,Eo,Es,Fi,Fr,Ga,Gd,Gv,\n"
|
||||||
" Hu,It,Ja,Ko,Kw,Nl,No,Pl,Pt,Sk,Sv,Ru,Wa)" },
|
" Hr,Hu,It,Ja,Ko,Kw,Nl,No,Pl,Pt,Sk,Sv,Ru,Wa)" },
|
||||||
{ "managed", 0, 0, do_managed,
|
{ "managed", 0, 0, 0, do_managed,
|
||||||
"--managed Allow the window manager to manage created windows" },
|
"--managed Allow the window manager to manage created windows" },
|
||||||
{ "synchronous", 0, 0, do_synchronous,
|
{ "synchronous", 0, 0, 1, do_synchronous,
|
||||||
"--synchronous Turn on synchronous display mode" },
|
"--synchronous Turn on synchronous display mode" },
|
||||||
{ "version", 'v', 0, do_version,
|
{ "version", 'v', 0, 0, do_version,
|
||||||
"--version,-v Display the Wine version" },
|
"--version,-v Display the Wine version" },
|
||||||
{ "winver", 0, 1, VERSION_ParseWinVersion,
|
{ "winver", 0, 1, 1, VERSION_ParseWinVersion,
|
||||||
"--winver Version to imitate (one of win31,win95,nt351,nt40)" },
|
"--winver Version to imitate (one of win31,win95,nt351,nt40)" },
|
||||||
{ NULL, } /* terminator */
|
{ NULL, } /* terminator */
|
||||||
};
|
};
|
||||||
|
@ -99,12 +117,12 @@ static void do_synchronous( const char *arg )
|
||||||
|
|
||||||
static void do_desktop( const char *arg )
|
static void do_desktop( const char *arg )
|
||||||
{
|
{
|
||||||
Options.desktopGeometry = strdup( arg );
|
Options.desktopGeometry = xstrdup( arg );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void do_display( const char *arg )
|
static void do_display( const char *arg )
|
||||||
{
|
{
|
||||||
Options.display = strdup( arg );
|
Options.display = xstrdup( arg );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void do_dll( const char *arg )
|
static void do_dll( const char *arg )
|
||||||
|
@ -117,7 +135,7 @@ static void do_dll( const char *arg )
|
||||||
MESSAGE("Only one -dll flag is allowed. Use ',' between multiple DLLs\n");
|
MESSAGE("Only one -dll flag is allowed. Use ',' between multiple DLLs\n");
|
||||||
ExitProcess(1);
|
ExitProcess(1);
|
||||||
}
|
}
|
||||||
Options.dllFlags = strdup( arg );
|
Options.dllFlags = xstrdup( arg );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void do_managed( const char *arg )
|
static void do_managed( const char *arg )
|
||||||
|
@ -127,35 +145,42 @@ static void do_managed( const char *arg )
|
||||||
|
|
||||||
static void do_config( const char *arg )
|
static void do_config( const char *arg )
|
||||||
{
|
{
|
||||||
Options.configFileName = strdup( arg );
|
Options.configFileName = xstrdup( arg );
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void remove_options( char *argv[], int pos, int count )
|
static void remove_options( char *argv[], int pos, int count, int inherit )
|
||||||
{
|
{
|
||||||
|
if (inherit)
|
||||||
|
{
|
||||||
|
int i, len = 0;
|
||||||
|
for (i = 0; i < count; i++) len += strlen(argv[pos+i]) + 1;
|
||||||
|
if (inherit_str)
|
||||||
|
{
|
||||||
|
if (!(inherit_str = realloc( inherit_str, strlen(inherit_str) + len )))
|
||||||
|
out_of_memory();
|
||||||
|
strcat( inherit_str, " " );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (!(inherit_str = malloc( len ))) out_of_memory();
|
||||||
|
inherit_str[0] = 0;
|
||||||
|
}
|
||||||
|
for (i = 0; i < count; i++)
|
||||||
|
{
|
||||||
|
strcat( inherit_str, argv[pos+i] );
|
||||||
|
if (i < count-1) strcat( inherit_str, " " );
|
||||||
|
}
|
||||||
|
}
|
||||||
while ((argv[pos] = argv[pos+count])) pos++;
|
while ((argv[pos] = argv[pos+count])) pos++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/* parse options from the argv array and remove all the recognized ones */
|
||||||
* OPTIONS_Usage
|
static void parse_options( char *argv[] )
|
||||||
*/
|
|
||||||
void OPTIONS_Usage(void)
|
|
||||||
{
|
|
||||||
const struct option *opt;
|
|
||||||
MESSAGE( "Usage: %s [options] program_name [arguments]\n\n", argv0 );
|
|
||||||
MESSAGE( "Options:\n" );
|
|
||||||
for (opt = option_table; opt->longname; opt++) MESSAGE( " %s\n", opt->usage );
|
|
||||||
ExitProcess(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* OPTIONS_ParseOptions
|
|
||||||
*/
|
|
||||||
void OPTIONS_ParseOptions( char *argv[] )
|
|
||||||
{
|
{
|
||||||
const struct option *opt;
|
const struct option *opt;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 1; argv[i]; i++)
|
for (i = 0; argv[i]; i++)
|
||||||
{
|
{
|
||||||
char *p = argv[i];
|
char *p = argv[i];
|
||||||
if (*p++ != '-') continue; /* not an option */
|
if (*p++ != '-') continue; /* not an option */
|
||||||
|
@ -176,27 +201,76 @@ void OPTIONS_ParseOptions( char *argv[] )
|
||||||
if (opt->has_arg && argv[i+1])
|
if (opt->has_arg && argv[i+1])
|
||||||
{
|
{
|
||||||
opt->func( argv[i+1] );
|
opt->func( argv[i+1] );
|
||||||
remove_options( argv, i, 2 );
|
remove_options( argv, i, 2, opt->inherit );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
opt->func( "" );
|
opt->func( "" );
|
||||||
remove_options( argv, i, 1 );
|
remove_options( argv, i, 1, opt->inherit );
|
||||||
}
|
}
|
||||||
i--;
|
i--;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* inherit options from WINEOPTIONS variable */
|
||||||
|
static void inherit_options( char *buffer )
|
||||||
|
{
|
||||||
|
char *argv[256];
|
||||||
|
int i;
|
||||||
|
|
||||||
|
char *p = strtok( buffer, " \t" );
|
||||||
|
for (i = 0; i < sizeof(argv)/sizeof(argv[0])-1 && p; i++)
|
||||||
|
{
|
||||||
|
argv[i] = p;
|
||||||
|
p = strtok( NULL, " \t" );
|
||||||
|
}
|
||||||
|
argv[i] = NULL;
|
||||||
|
parse_options( argv );
|
||||||
|
if (argv[0]) /* an option remains */
|
||||||
|
{
|
||||||
|
MESSAGE( "Unknown option '%s' in WINEOPTIONS variable\n\n", argv[0] );
|
||||||
|
OPTIONS_Usage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
* OPTIONS_Usage
|
||||||
|
*/
|
||||||
|
void OPTIONS_Usage(void)
|
||||||
|
{
|
||||||
|
const struct option *opt;
|
||||||
|
MESSAGE( "Usage: %s [options] program_name [arguments]\n\n", argv0 );
|
||||||
|
MESSAGE( "Options:\n" );
|
||||||
|
for (opt = option_table; opt->longname; opt++) MESSAGE( " %s\n", opt->usage );
|
||||||
|
ExitProcess(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
* OPTIONS_ParseOptions
|
||||||
|
*/
|
||||||
|
void OPTIONS_ParseOptions( char *argv[] )
|
||||||
|
{
|
||||||
|
char buffer[1024];
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if (GetEnvironmentVariableA( "WINEOPTIONS", buffer, sizeof(buffer) ) && buffer[0])
|
||||||
|
inherit_options( buffer );
|
||||||
|
|
||||||
|
parse_options( argv + 1 );
|
||||||
|
|
||||||
|
SetEnvironmentVariableA( "WINEOPTIONS", inherit_str );
|
||||||
|
|
||||||
/* check if any option remains */
|
/* check if any option remains */
|
||||||
for (i = 1; argv[i]; i++)
|
for (i = 1; argv[i]; i++)
|
||||||
{
|
{
|
||||||
if (!strcmp( argv[i], "--" ))
|
if (!strcmp( argv[i], "--" ))
|
||||||
{
|
{
|
||||||
remove_options( argv, i, 1 );
|
remove_options( argv, i, 1, 0 );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (argv[i][0] == '-')
|
if (argv[i][0] == '-')
|
||||||
{
|
{
|
||||||
MESSAGE( "Unknown option '%s'\n", argv[i] );
|
MESSAGE( "Unknown option '%s'\n\n", argv[i] );
|
||||||
OPTIONS_Usage();
|
OPTIONS_Usage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue