mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-20 22:48:22 +00:00
osdep: Remove trailing whitespaces
Signed-off-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
1 parent
8ff08468d3
commit
55e237b57d
22 files changed
+46
-46
No files matched your search
@@ -193,7 +193,7 @@ grub_guess_root_devices (const char *path)
|
|||||||
|
|
||||||
os_dev = xmalloc (2 * sizeof (os_dev[0]));
|
os_dev = xmalloc (2 * sizeof (os_dev[0]));
|
||||||
sz = strlen (nm);
|
sz = strlen (nm);
|
||||||
|
|
||||||
os_dev[0] = xmalloc (sz + 4);
|
os_dev[0] = xmalloc (sz + 4);
|
||||||
os_dev[0][0] = '/';
|
os_dev[0][0] = '/';
|
||||||
os_dev[0][1] = '/';
|
os_dev[0][1] = '/';
|
||||||
|
|||||||
@@ -572,7 +572,7 @@ get_temp_name (void)
|
|||||||
static int ctr = 0;
|
static int ctr = 0;
|
||||||
char *t;
|
char *t;
|
||||||
struct stat st;
|
struct stat st;
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
t = xasprintf ("T:grub.%d.%d.%d.%d", (int) getpid (), (int) getppid (),
|
t = xasprintf ("T:grub.%d.%d.%d.%d", (int) getpid (), (int) getppid (),
|
||||||
|
|||||||
@@ -2,19 +2,19 @@
|
|||||||
#include <grub/util/install.h>
|
#include <grub/util/install.h>
|
||||||
#include <grub/util/misc.h>
|
#include <grub/util/misc.h>
|
||||||
|
|
||||||
int
|
int
|
||||||
grub_install_compress_gzip (const char *src, const char *dest)
|
grub_install_compress_gzip (const char *src, const char *dest)
|
||||||
{
|
{
|
||||||
grub_util_error (_("no compression is available for your platform"));
|
grub_util_error (_("no compression is available for your platform"));
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
grub_install_compress_xz (const char *src, const char *dest)
|
grub_install_compress_xz (const char *src, const char *dest)
|
||||||
{
|
{
|
||||||
grub_util_error (_("no compression is available for your platform"));
|
grub_util_error (_("no compression is available for your platform"));
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
grub_install_compress_lzop (const char *src, const char *dest)
|
grub_install_compress_lzop (const char *src, const char *dest)
|
||||||
{
|
{
|
||||||
grub_util_error (_("no compression is available for your platform"));
|
grub_util_error (_("no compression is available for your platform"));
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ grub_install_get_default_arm_platform (void)
|
|||||||
|
|
||||||
const char *
|
const char *
|
||||||
grub_install_get_default_x86_platform (void)
|
grub_install_get_default_x86_platform (void)
|
||||||
{
|
{
|
||||||
return "i386-pc";
|
return "i386-pc";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -193,7 +193,7 @@ grub_util_find_partition_start_os (const char *dev)
|
|||||||
p_index = dev[strlen(dev) - 1] - 'a';
|
p_index = dev[strlen(dev) - 1] - 'a';
|
||||||
else
|
else
|
||||||
p_index = -1;
|
p_index = -1;
|
||||||
|
|
||||||
if (p_index >= label.d_npartitions || p_index < 0)
|
if (p_index >= label.d_npartitions || p_index < 0)
|
||||||
{
|
{
|
||||||
grub_error (GRUB_ERR_BAD_DEVICE,
|
grub_error (GRUB_ERR_BAD_DEVICE,
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ grub_util_get_dm_node_linear_info (dev_t dev,
|
|||||||
dmt = dm_task_create(DM_DEVICE_TABLE);
|
dmt = dm_task_create(DM_DEVICE_TABLE);
|
||||||
if (!dmt)
|
if (!dmt)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (! (dm_task_set_major_minor (dmt, major, minor, 0)))
|
if (! (dm_task_set_major_minor (dmt, major, minor, 0)))
|
||||||
{
|
{
|
||||||
dm_task_destroy (dmt);
|
dm_task_destroy (dmt);
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ grub_util_get_geom_abstraction (const char *dev)
|
|||||||
{
|
{
|
||||||
struct ggeom *geom;
|
struct ggeom *geom;
|
||||||
LIST_FOREACH (geom, &class->lg_geom, lg_geom)
|
LIST_FOREACH (geom, &class->lg_geom, lg_geom)
|
||||||
{
|
{
|
||||||
struct gprovider *provider;
|
struct gprovider *provider;
|
||||||
LIST_FOREACH (provider, &geom->lg_provider, lg_provider)
|
LIST_FOREACH (provider, &geom->lg_provider, lg_provider)
|
||||||
if (strcmp (provider->lg_name, name) == 0)
|
if (strcmp (provider->lg_name, name) == 0)
|
||||||
@@ -167,7 +167,7 @@ grub_util_pull_device_os (const char *os_dev,
|
|||||||
{
|
{
|
||||||
struct ggeom *geom;
|
struct ggeom *geom;
|
||||||
LIST_FOREACH (geom, &class->lg_geom, lg_geom)
|
LIST_FOREACH (geom, &class->lg_geom, lg_geom)
|
||||||
{
|
{
|
||||||
struct gprovider *provider;
|
struct gprovider *provider;
|
||||||
LIST_FOREACH (provider, &geom->lg_provider, lg_provider)
|
LIST_FOREACH (provider, &geom->lg_provider, lg_provider)
|
||||||
if (strcmp (provider->lg_name, name) == 0)
|
if (strcmp (provider->lg_name, name) == 0)
|
||||||
@@ -261,7 +261,7 @@ grub_util_get_grub_dev_os (const char *os_dev)
|
|||||||
{
|
{
|
||||||
struct ggeom *geom;
|
struct ggeom *geom;
|
||||||
LIST_FOREACH (geom, &class->lg_geom, lg_geom)
|
LIST_FOREACH (geom, &class->lg_geom, lg_geom)
|
||||||
{
|
{
|
||||||
struct gprovider *provider;
|
struct gprovider *provider;
|
||||||
LIST_FOREACH (provider, &geom->lg_provider, lg_provider)
|
LIST_FOREACH (provider, &geom->lg_provider, lg_provider)
|
||||||
if (strcmp (provider->lg_name, name) == 0)
|
if (strcmp (provider->lg_name, name) == 0)
|
||||||
@@ -289,7 +289,7 @@ grub_util_get_grub_dev_os (const char *os_dev)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -325,7 +325,7 @@ grub_util_follow_gpart_up (const char *name, grub_disk_addr_t *off_out, char **n
|
|||||||
grub_util_error ("%s", _("couldn't find geom `part' class"));
|
grub_util_error ("%s", _("couldn't find geom `part' class"));
|
||||||
|
|
||||||
LIST_FOREACH (geom, &class->lg_geom, lg_geom)
|
LIST_FOREACH (geom, &class->lg_geom, lg_geom)
|
||||||
{
|
{
|
||||||
struct gprovider *provider;
|
struct gprovider *provider;
|
||||||
LIST_FOREACH (provider, &geom->lg_provider, lg_provider)
|
LIST_FOREACH (provider, &geom->lg_provider, lg_provider)
|
||||||
if (strcmp (provider->lg_name, name) == 0)
|
if (strcmp (provider->lg_name, name) == 0)
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ grub_util_find_partition_start_os (const char *dev)
|
|||||||
if (ioctl (fd, B_GET_GEOMETRY, &geo, sizeof (geo)) < 0)
|
if (ioctl (fd, B_GET_GEOMETRY, &geo, sizeof (geo)) < 0)
|
||||||
return 0;
|
return 0;
|
||||||
ret /= geo.bytes_per_sector ? : 512;
|
ret /= geo.bytes_per_sector ? : 512;
|
||||||
close (fd);
|
close (fd);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ grub_util_get_fd_size_os (grub_util_fd_t fd,
|
|||||||
{
|
{
|
||||||
device_geometry part;
|
device_geometry part;
|
||||||
unsigned lg;
|
unsigned lg;
|
||||||
if (ioctl (fd, B_GET_GEOMETRY, &part, sizeof (part)) < 0)
|
if (ioctl (fd, B_GET_GEOMETRY, &part, sizeof (part)) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
for (lg = 0; (1 << lg) < part.bytes_per_sector; lg++);
|
for (lg = 0; (1 << lg) < part.bytes_per_sector; lg++);
|
||||||
if (log_secsize)
|
if (log_secsize)
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ grub_install_get_blocklist (grub_device_t root_dev,
|
|||||||
if (ioctl (fd, FIBMAP, &blk) < 0)
|
if (ioctl (fd, FIBMAP, &blk) < 0)
|
||||||
grub_util_error (_("can't retrieve blocklists: %s"),
|
grub_util_error (_("can't retrieve blocklists: %s"),
|
||||||
strerror (errno));
|
strerror (errno));
|
||||||
|
|
||||||
rest = core_size - ((i * mul) << GRUB_DISK_SECTOR_BITS);
|
rest = core_size - ((i * mul) << GRUB_DISK_SECTOR_BITS);
|
||||||
if (rest <= 0)
|
if (rest <= 0)
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -278,12 +278,12 @@ get_btrfs_fs_prefix (const char *mount_path)
|
|||||||
char *ret = NULL;
|
char *ret = NULL;
|
||||||
|
|
||||||
fd = open (mount_path, O_RDONLY);
|
fd = open (mount_path, O_RDONLY);
|
||||||
|
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
memset (&args, 0, sizeof(args));
|
memset (&args, 0, sizeof(args));
|
||||||
args.objectid = GRUB_BTRFS_TREE_ROOT_OBJECTID;
|
args.objectid = GRUB_BTRFS_TREE_ROOT_OBJECTID;
|
||||||
|
|
||||||
if (ioctl (fd, BTRFS_IOC_INO_LOOKUP, &args) < 0)
|
if (ioctl (fd, BTRFS_IOC_INO_LOOKUP, &args) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
tree_id = args.treeid;
|
tree_id = args.treeid;
|
||||||
@@ -620,7 +620,7 @@ get_mdadm_uuid (const char *os_dev)
|
|||||||
if (strncmp (buf, "MD_UUID=", sizeof ("MD_UUID=") - 1) == 0)
|
if (strncmp (buf, "MD_UUID=", sizeof ("MD_UUID=") - 1) == 0)
|
||||||
{
|
{
|
||||||
char *name_start, *ptri, *ptro;
|
char *name_start, *ptri, *ptro;
|
||||||
|
|
||||||
free (name);
|
free (name);
|
||||||
name_start = buf + sizeof ("MD_UUID=") - 1;
|
name_start = buf + sizeof ("MD_UUID=") - 1;
|
||||||
ptro = name = xmalloc (strlen (name_start) + 1);
|
ptro = name = xmalloc (strlen (name_start) + 1);
|
||||||
@@ -708,7 +708,7 @@ grub_util_is_imsm (const char *os_dev)
|
|||||||
sizeof ("MD_METADATA=imsm") - 1) == 0)
|
sizeof ("MD_METADATA=imsm") - 1) == 0)
|
||||||
{
|
{
|
||||||
is_imsm = 1;
|
is_imsm = 1;
|
||||||
grub_util_info ("%s is imsm", dev);
|
grub_util_info ("%s is imsm", dev);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,21 +19,21 @@
|
|||||||
#include <grub/emu/exec.h>
|
#include <grub/emu/exec.h>
|
||||||
#include <grub/util/install.h>
|
#include <grub/util/install.h>
|
||||||
|
|
||||||
int
|
int
|
||||||
grub_install_compress_gzip (const char *src, const char *dest)
|
grub_install_compress_gzip (const char *src, const char *dest)
|
||||||
{
|
{
|
||||||
return grub_util_exec_redirect ((const char * []) { "gzip", "--best",
|
return grub_util_exec_redirect ((const char * []) { "gzip", "--best",
|
||||||
"--stdout", NULL }, src, dest);
|
"--stdout", NULL }, src, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
grub_install_compress_xz (const char *src, const char *dest)
|
grub_install_compress_xz (const char *src, const char *dest)
|
||||||
{
|
{
|
||||||
return grub_util_exec_redirect ((const char * []) { "xz",
|
return grub_util_exec_redirect ((const char * []) { "xz",
|
||||||
"--lzma2=dict=128KiB", "--check=none", "--stdout", NULL }, src, dest);
|
"--lzma2=dict=128KiB", "--check=none", "--stdout", NULL }, src, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
grub_install_compress_lzop (const char *src, const char *dest)
|
grub_install_compress_lzop (const char *src, const char *dest)
|
||||||
{
|
{
|
||||||
return grub_util_exec_redirect ((const char * []) { "lzop", "-9", "-c",
|
return grub_util_exec_redirect ((const char * []) { "lzop", "-9", "-c",
|
||||||
|
|||||||
@@ -17,6 +17,6 @@ grub_util_get_cpu_time_ms (void)
|
|||||||
sc_clk_tck = 1000;
|
sc_clk_tck = 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
times (&tm);
|
times (&tm);
|
||||||
return (tm.tms_utime * 1000ULL) / sc_clk_tck;
|
return (tm.tms_utime * 1000ULL) / sc_clk_tck;
|
||||||
}
|
}
|
||||||
@@ -88,7 +88,7 @@ grub_util_exec_redirect_all (const char *const *argv, const char *stdin_file,
|
|||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
/* Child. */
|
/* Child. */
|
||||||
|
|
||||||
/* Close fd's. */
|
/* Close fd's. */
|
||||||
#ifdef GRUB_UTIL
|
#ifdef GRUB_UTIL
|
||||||
grub_util_devmapper_cleanup ();
|
grub_util_devmapper_cleanup ();
|
||||||
|
|||||||
@@ -257,7 +257,7 @@ grub_util_find_root_devices_from_poolname (char *poolname)
|
|||||||
ret = getline (&line, &len, fp);
|
ret = getline (&line, &len, fp);
|
||||||
if (ret == -1)
|
if (ret == -1)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (sscanf (line, " %s %256s %256s %256s %256s %256s",
|
if (sscanf (line, " %s %256s %256s %256s %256s %256s",
|
||||||
name, state, readlen, writelen, cksum, notes) >= 5)
|
name, state, readlen, writelen, cksum, notes) >= 5)
|
||||||
switch (st)
|
switch (st)
|
||||||
@@ -305,7 +305,7 @@ grub_util_find_root_devices_from_poolname (char *poolname)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
free (line);
|
free (line);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -449,7 +449,7 @@ grub_find_device (const char *dir, dev_t dev)
|
|||||||
|
|
||||||
cwd = xgetcwd ();
|
cwd = xgetcwd ();
|
||||||
res = xmalloc (strlen (cwd) + strlen (ent->d_name) + 3);
|
res = xmalloc (strlen (cwd) + strlen (ent->d_name) + 3);
|
||||||
sprintf (res,
|
sprintf (res,
|
||||||
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
||||||
/* Convert this block device to its character (raw) device. */
|
/* Convert this block device to its character (raw) device. */
|
||||||
"%s/r%s",
|
"%s/r%s",
|
||||||
|
|||||||
@@ -164,13 +164,13 @@ grub_install_register_efi (grub_device_t efidir_grub_dev,
|
|||||||
ret = grub_util_exec ((const char * []){ "efibootmgr", "-q",
|
ret = grub_util_exec ((const char * []){ "efibootmgr", "-q",
|
||||||
"-c", "-d", efidir_disk,
|
"-c", "-d", efidir_disk,
|
||||||
"-p", efidir_part_str, "-w",
|
"-p", efidir_part_str, "-w",
|
||||||
"-L", efi_distributor, "-l",
|
"-L", efi_distributor, "-l",
|
||||||
efifile_path, NULL });
|
efifile_path, NULL });
|
||||||
else
|
else
|
||||||
ret = grub_util_exec ((const char * []){ "efibootmgr",
|
ret = grub_util_exec ((const char * []){ "efibootmgr",
|
||||||
"-c", "-d", efidir_disk,
|
"-c", "-d", efidir_disk,
|
||||||
"-p", efidir_part_str, "-w",
|
"-p", efidir_part_str, "-w",
|
||||||
"-L", efi_distributor, "-l",
|
"-L", efi_distributor, "-l",
|
||||||
efifile_path, NULL });
|
efifile_path, NULL });
|
||||||
free (efidir_part_str);
|
free (efidir_part_str);
|
||||||
return ret;
|
return ret;
|
||||||
@@ -235,7 +235,7 @@ grub_install_sgi_setup (const char *install_device,
|
|||||||
const char *imgfile, const char *destname)
|
const char *imgfile, const char *destname)
|
||||||
{
|
{
|
||||||
grub_util_exec ((const char * []){ "dvhtool", "-d",
|
grub_util_exec ((const char * []){ "dvhtool", "-d",
|
||||||
install_device, "--unix-to-vh",
|
install_device, "--unix-to-vh",
|
||||||
imgfile, destname, NULL });
|
imgfile, destname, NULL });
|
||||||
grub_util_warn ("%s", _("You will have to set `SystemPartition' and `OSLoader' manually."));
|
grub_util_warn ("%s", _("You will have to set `SystemPartition' and `OSLoader' manually."));
|
||||||
}
|
}
|
||||||
@@ -128,7 +128,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
|
|||||||
free (buf);
|
free (buf);
|
||||||
buf3 = xstrdup (buf2 + offset);
|
buf3 = xstrdup (buf2 + offset);
|
||||||
buf2[offset] = 0;
|
buf2[offset] = 0;
|
||||||
|
|
||||||
free (buf2);
|
free (buf2);
|
||||||
|
|
||||||
/* Remove trailing slashes, return empty string if root directory. */
|
/* Remove trailing slashes, return empty string if root directory. */
|
||||||
|
|||||||
@@ -119,16 +119,16 @@ grub_guess_root_devices (const char *dir)
|
|||||||
{
|
{
|
||||||
free (dirwindows);
|
free (dirwindows);
|
||||||
grub_util_info ("can't get volume path name: %d", (int) GetLastError ());
|
grub_util_info ("can't get volume path name: %d", (int) GetLastError ());
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!mntpointwindows[0])
|
if (!mntpointwindows[0])
|
||||||
{
|
{
|
||||||
free (dirwindows);
|
free (dirwindows);
|
||||||
free (mntpointwindows);
|
free (mntpointwindows);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (ptr = mntpointwindows; *ptr; ptr++);
|
for (ptr = mntpointwindows; *ptr; ptr++);
|
||||||
if (*(ptr - 1) != '\\')
|
if (*(ptr - 1) != '\\')
|
||||||
{
|
{
|
||||||
@@ -255,7 +255,7 @@ grub_util_part_to_disk (const char *os_dev,
|
|||||||
free (name);
|
free (name);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
CloseHandle (hd);
|
CloseHandle (hd);
|
||||||
|
|
||||||
*is_part = 1;
|
*is_part = 1;
|
||||||
@@ -323,7 +323,7 @@ grub_util_find_partition_start_os (const char *os_dev)
|
|||||||
free (name);
|
free (name);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
CloseHandle (hd);
|
CloseHandle (hd);
|
||||||
free (name);
|
free (name);
|
||||||
return exts.Extents[0].StartingOffset.QuadPart / 512;
|
return exts.Extents[0].StartingOffset.QuadPart / 512;
|
||||||
|
|||||||
@@ -351,7 +351,7 @@ grub_canonicalize_file_name (const char *path)
|
|||||||
return NULL;
|
return NULL;
|
||||||
ret = grub_util_tchar_to_utf8 (windows_path);
|
ret = grub_util_tchar_to_utf8 (windows_path);
|
||||||
free (windows_path);
|
free (windows_path);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -359,7 +359,7 @@ void
|
|||||||
grub_util_mkdir (const char *dir)
|
grub_util_mkdir (const char *dir)
|
||||||
{
|
{
|
||||||
LPTSTR windows_name;
|
LPTSTR windows_name;
|
||||||
|
|
||||||
windows_name = grub_util_get_windows_path (dir);
|
windows_name = grub_util_get_windows_path (dir);
|
||||||
CreateDirectory (windows_name, NULL);
|
CreateDirectory (windows_name, NULL);
|
||||||
free (windows_name);
|
free (windows_name);
|
||||||
@@ -522,7 +522,7 @@ get_temp_name (void)
|
|||||||
*ptr++ = '0' + r;
|
*ptr++ = '0' + r;
|
||||||
else
|
else
|
||||||
*ptr++ = 'a' + (r - 10);
|
*ptr++ = 'a' + (r - 10);
|
||||||
}
|
}
|
||||||
*ptr = '\0';
|
*ptr = '\0';
|
||||||
|
|
||||||
return grub_util_tchar_to_utf8 (rt);
|
return grub_util_tchar_to_utf8 (rt);
|
||||||
@@ -606,7 +606,7 @@ grub_util_get_mtime (const char *path)
|
|||||||
us_ul.LowPart = attr.ftLastWriteTime.dwLowDateTime;
|
us_ul.LowPart = attr.ftLastWriteTime.dwLowDateTime;
|
||||||
us_ul.HighPart = attr.ftLastWriteTime.dwHighDateTime;
|
us_ul.HighPart = attr.ftLastWriteTime.dwHighDateTime;
|
||||||
|
|
||||||
return (us_ul.QuadPart / 10000000)
|
return (us_ul.QuadPart / 10000000)
|
||||||
- 86400ULL * 365 * (1970 - 1601)
|
- 86400ULL * 365 * (1970 - 1601)
|
||||||
- 86400ULL * ((1970 - 1601) / 4) + 86400ULL * ((1970 - 1601) / 100);
|
- 86400ULL * ((1970 - 1601) / 4) + 86400ULL * ((1970 - 1601) / 100);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),
|
|||||||
*argv = xcalloc (*argc + 1, sizeof (argv[0]));
|
*argv = xcalloc (*argc + 1, sizeof (argv[0]));
|
||||||
|
|
||||||
for (i = 0; i < *argc; i++)
|
for (i = 0; i < *argc; i++)
|
||||||
(*argv)[i] = grub_util_tchar_to_utf8 (targv[i]);
|
(*argv)[i] = grub_util_tchar_to_utf8 (targv[i]);
|
||||||
(*argv)[i] = NULL;
|
(*argv)[i] = NULL;
|
||||||
#else
|
#else
|
||||||
#error "Unsupported TCHAR size"
|
#error "Unsupported TCHAR size"
|
||||||
|
|||||||
@@ -29,12 +29,12 @@
|
|||||||
int
|
int
|
||||||
grub_password_get (char buf[], unsigned buf_size)
|
grub_password_get (char buf[], unsigned buf_size)
|
||||||
{
|
{
|
||||||
HANDLE hStdin = GetStdHandle (STD_INPUT_HANDLE);
|
HANDLE hStdin = GetStdHandle (STD_INPUT_HANDLE);
|
||||||
DWORD mode = 0;
|
DWORD mode = 0;
|
||||||
char *ptr;
|
char *ptr;
|
||||||
|
|
||||||
grub_refresh ();
|
grub_refresh ();
|
||||||
|
|
||||||
GetConsoleMode (hStdin, &mode);
|
GetConsoleMode (hStdin, &mode);
|
||||||
SetConsoleMode (hStdin, mode & (~ENABLE_ECHO_INPUT));
|
SetConsoleMode (hStdin, mode & (~ENABLE_ECHO_INPUT));
|
||||||
|
|
||||||
|
|||||||
@@ -104,14 +104,14 @@ get_platform (void)
|
|||||||
{
|
{
|
||||||
platform = PLAT_BIOS;
|
platform = PLAT_BIOS;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
platform = PLAT_EFI;
|
platform = PLAT_EFI;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *
|
const char *
|
||||||
grub_install_get_default_x86_platform (void)
|
grub_install_get_default_x86_platform (void)
|
||||||
{
|
{
|
||||||
SYSTEM_INFO si;
|
SYSTEM_INFO si;
|
||||||
|
|
||||||
get_platform ();
|
get_platform ();
|
||||||
|
|||||||
Reference in new issue
Block a user