Move set_program_name and init_nls to host_init. On windows
fix in this fuction console and argument charset as well.
This commit is contained in:
parent
4cd3c4fec7
commit
ae5540d3d4
24 changed files with 282 additions and 78 deletions
|
@ -274,6 +274,8 @@ main (int argc, char *argv[])
|
|||
char *command;
|
||||
int curindex, arg_count;
|
||||
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
grub_util_init_nls ();
|
||||
|
|
|
@ -733,9 +733,7 @@ main (int argc, char *argv[])
|
|||
const char *default_root;
|
||||
char *alloc_root;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
grub_util_init_nls ();
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
args = xmalloc (argc * sizeof (args[0]));
|
||||
|
||||
|
|
|
@ -168,7 +168,7 @@ main (int argc, char *argv[])
|
|||
FILE *in32, *in64, *out;
|
||||
struct arguments arguments;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
/* Check for options. */
|
||||
memset (&arguments, 0, sizeof (struct arguments));
|
||||
|
|
|
@ -37,6 +37,8 @@ main (int argc, char **argv)
|
|||
int suffixlen = 0;
|
||||
const char *out_fname = 0;
|
||||
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
if (argc >= 2 && argv[1][0] == '-')
|
||||
{
|
||||
fprintf (stdout, _("Usage: %s [INFILE [OUTFILE]]\n"), argv[0]);
|
||||
|
|
|
@ -1155,11 +1155,9 @@ main (int argc, char *argv[])
|
|||
struct arguments arguments;
|
||||
|
||||
#ifndef GRUB_BUILD
|
||||
set_program_name (argv[0]);
|
||||
grub_util_host_init (&argc, &argv);
|
||||
#endif
|
||||
|
||||
grub_util_init_nls ();
|
||||
|
||||
memset (&arguments, 0, sizeof (struct arguments));
|
||||
arguments.file_format = PF2;
|
||||
arguments.files_max = argc + 1;
|
||||
|
|
|
@ -2025,9 +2025,7 @@ main (int argc, char *argv[])
|
|||
FILE *fp = stdout;
|
||||
struct arguments arguments;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
grub_util_init_nls ();
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
memset (&arguments, 0, sizeof (struct arguments));
|
||||
arguments.comp = COMPRESSION_AUTO;
|
||||
|
|
|
@ -471,7 +471,7 @@ main (int argc, char *argv[])
|
|||
FILE *in, *out;
|
||||
struct arguments arguments;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
/* Check for options. */
|
||||
memset (&arguments, 0, sizeof (struct arguments));
|
||||
|
|
|
@ -119,9 +119,7 @@ main (int argc, char *argv[])
|
|||
char pass1[GRUB_AUTH_MAX_PASSLEN];
|
||||
char pass2[GRUB_AUTH_MAX_PASSLEN];
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
grub_util_init_nls ();
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
/* Check for options. */
|
||||
if (argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
|
||||
|
|
|
@ -82,9 +82,7 @@ main (int argc, char *argv[])
|
|||
char *relpath;
|
||||
struct arguments arguments;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
grub_util_init_nls ();
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
memset (&arguments, 0, sizeof (struct arguments));
|
||||
|
||||
|
|
|
@ -541,9 +541,7 @@ main (int argc, char *argv[])
|
|||
const char *default_root;
|
||||
char *alloc_root;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
grub_util_init_nls ();
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
fuse_args = xrealloc (fuse_args, (fuse_argc + 2) * sizeof (fuse_args[0]));
|
||||
fuse_args[fuse_argc] = xstrdup (argv[0]);
|
||||
|
|
|
@ -910,9 +910,7 @@ main (int argc, char *argv[])
|
|||
char delim;
|
||||
struct arguments arguments;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
grub_util_init_nls ();
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
memset (&arguments, 0, sizeof (struct arguments));
|
||||
arguments.device_max = argc + 1;
|
||||
|
|
|
@ -208,9 +208,7 @@ main (int argc, char *argv[])
|
|||
ieee1275_palette[cptr].b = 0;
|
||||
ieee1275_palette[cptr].a = 0xff;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
grub_util_init_nls ();
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
/* Check for options. */
|
||||
memset (&arguments, 0, sizeof (struct arguments));
|
||||
|
|
|
@ -146,8 +146,7 @@ main (int argc, char *argv[])
|
|||
int found_input = 0, found_cmd = 0;
|
||||
struct grub_script *script = NULL;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
grub_util_init_nls ();
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
memset (&ctx.arguments, 0, sizeof (struct arguments));
|
||||
|
||||
|
|
|
@ -1138,9 +1138,7 @@ main (int argc, char *argv[])
|
|||
char *dest_dev = NULL;
|
||||
struct arguments arguments;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
grub_util_init_nls ();
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
/* Default option values. */
|
||||
memset (&arguments, 0, sizeof (struct arguments));
|
||||
|
|
|
@ -32,9 +32,7 @@ int main(int argc, char **argv)
|
|||
{
|
||||
char *of_path;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
grub_util_init_nls ();
|
||||
grub_util_host_init (&argc, &argv);
|
||||
|
||||
if (argc != 2 || strcmp (argv[1], "--help") == 0)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue