2004-04-04 Yoshinori K. Okuji <okuji@enbug.org>
All symbols prefixed with PUPA_ and pupa_ are renamed to GRUB_ and grub_, respectively. Because the conversion is trivial and mechanical, I omit the details here. Please refer to the CVS if you need more information.
This commit is contained in:
okuji
parent
6a1425510d
commit
4b13b216f4
125 changed files with 6198 additions and 6181 deletions
|
|
@ -1,9 +1,9 @@
|
|||
/* boot.c - command to boot an operating system */
|
||||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
*
|
||||
* PUPA is free software; you can redistribute it and/or modify
|
||||
* GRUB is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
|
@ -14,52 +14,52 @@
|
|||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with PUPA; if not, write to the Free Software
|
||||
* along with GRUB; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <pupa/normal.h>
|
||||
#include <pupa/dl.h>
|
||||
#include <pupa/arg.h>
|
||||
#include <pupa/misc.h>
|
||||
#include <pupa/loader.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/arg.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/loader.h>
|
||||
|
||||
static pupa_err_t
|
||||
pupa_cmd_boot (struct pupa_arg_list *state __attribute__ ((unused)),
|
||||
static grub_err_t
|
||||
grub_cmd_boot (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args __attribute__ ((unused)))
|
||||
{
|
||||
if (argc)
|
||||
return pupa_error (PUPA_ERR_BAD_ARGUMENT, "too many arguments");
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "too many arguments");
|
||||
|
||||
pupa_loader_boot ();
|
||||
grub_loader_boot ();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#ifdef PUPA_UTIL
|
||||
#ifdef GRUB_UTIL
|
||||
void
|
||||
pupa_boot_init (void)
|
||||
grub_boot_init (void)
|
||||
{
|
||||
pupa_register_command ("boot", pupa_cmd_boot, PUPA_COMMAND_FLAG_BOTH,
|
||||
grub_register_command ("boot", grub_cmd_boot, GRUB_COMMAND_FLAG_BOTH,
|
||||
"boot", "Boot an operating system", 0);
|
||||
}
|
||||
|
||||
void
|
||||
pupa_boot_fini (void)
|
||||
grub_boot_fini (void)
|
||||
{
|
||||
pupa_unregister_command ("boot");
|
||||
grub_unregister_command ("boot");
|
||||
}
|
||||
#else /* ! PUPA_UTIL */
|
||||
PUPA_MOD_INIT
|
||||
#else /* ! GRUB_UTIL */
|
||||
GRUB_MOD_INIT
|
||||
{
|
||||
(void)mod; /* To stop warning. */
|
||||
pupa_register_command ("boot", pupa_cmd_boot, PUPA_COMMAND_FLAG_BOTH,
|
||||
grub_register_command ("boot", grub_cmd_boot, GRUB_COMMAND_FLAG_BOTH,
|
||||
"boot", "Boot an operating system", 0);
|
||||
}
|
||||
|
||||
PUPA_MOD_FINI
|
||||
GRUB_MOD_FINI
|
||||
{
|
||||
pupa_unregister_command ("boot");
|
||||
grub_unregister_command ("boot");
|
||||
}
|
||||
#endif /* ! PUPA_UTIL */
|
||||
#endif /* ! GRUB_UTIL */
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/* cat.c - command to show the contents of a file */
|
||||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
*
|
||||
* PUPA is free software; you can redistribute it and/or modify
|
||||
* GRUB is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
|
@ -14,35 +14,35 @@
|
|||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with PUPA; if not, write to the Free Software
|
||||
* along with GRUB; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <pupa/normal.h>
|
||||
#include <pupa/dl.h>
|
||||
#include <pupa/arg.h>
|
||||
#include <pupa/file.h>
|
||||
#include <pupa/disk.h>
|
||||
#include <pupa/term.h>
|
||||
#include <pupa/misc.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/arg.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/disk.h>
|
||||
#include <grub/term.h>
|
||||
#include <grub/misc.h>
|
||||
|
||||
static pupa_err_t
|
||||
pupa_cmd_cat (struct pupa_arg_list *state __attribute__ ((unused)),
|
||||
static grub_err_t
|
||||
grub_cmd_cat (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
|
||||
{
|
||||
pupa_file_t file;
|
||||
char buf[PUPA_DISK_SECTOR_SIZE];
|
||||
pupa_ssize_t size;
|
||||
grub_file_t file;
|
||||
char buf[GRUB_DISK_SECTOR_SIZE];
|
||||
grub_ssize_t size;
|
||||
|
||||
if (argc != 1)
|
||||
return pupa_error (PUPA_ERR_BAD_ARGUMENT, "file name required");
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
|
||||
|
||||
file = pupa_file_open (args[0]);
|
||||
file = grub_file_open (args[0]);
|
||||
if (! file)
|
||||
return 0;
|
||||
|
||||
while ((size = pupa_file_read (file, buf, sizeof (buf))) > 0)
|
||||
while ((size = grub_file_read (file, buf, sizeof (buf))) > 0)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -50,48 +50,48 @@ pupa_cmd_cat (struct pupa_arg_list *state __attribute__ ((unused)),
|
|||
{
|
||||
unsigned char c = buf[i];
|
||||
|
||||
if (pupa_isprint (c) || pupa_isspace (c))
|
||||
pupa_putchar (c);
|
||||
if (grub_isprint (c) || grub_isspace (c))
|
||||
grub_putchar (c);
|
||||
else
|
||||
{
|
||||
pupa_setcolorstate (PUPA_TERM_COLOR_HIGHLIGHT);
|
||||
pupa_printf ("<%x>", (int) c);
|
||||
pupa_setcolorstate (PUPA_TERM_COLOR_STANDARD);
|
||||
grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
|
||||
grub_printf ("<%x>", (int) c);
|
||||
grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pupa_putchar ('\n');
|
||||
pupa_refresh ();
|
||||
pupa_file_close (file);
|
||||
grub_putchar ('\n');
|
||||
grub_refresh ();
|
||||
grub_file_close (file);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#ifdef PUPA_UTIL
|
||||
#ifdef GRUB_UTIL
|
||||
void
|
||||
pupa_cat_init (void)
|
||||
grub_cat_init (void)
|
||||
{
|
||||
pupa_register_command ("cat", pupa_cmd_cat, PUPA_COMMAND_FLAG_BOTH,
|
||||
grub_register_command ("cat", grub_cmd_cat, GRUB_COMMAND_FLAG_BOTH,
|
||||
"cat FILE", "Show the contents of a file", 0);
|
||||
}
|
||||
|
||||
void
|
||||
pupa_cat_fini (void)
|
||||
grub_cat_fini (void)
|
||||
{
|
||||
pupa_unregister_command ("cat");
|
||||
grub_unregister_command ("cat");
|
||||
}
|
||||
#else /* ! PUPA_UTIL */
|
||||
PUPA_MOD_INIT
|
||||
#else /* ! GRUB_UTIL */
|
||||
GRUB_MOD_INIT
|
||||
{
|
||||
(void)mod; /* To stop warning. */
|
||||
pupa_register_command ("cat", pupa_cmd_cat, PUPA_COMMAND_FLAG_BOTH,
|
||||
grub_register_command ("cat", grub_cmd_cat, GRUB_COMMAND_FLAG_BOTH,
|
||||
"cat FILE", "Show the contents of a file", 0);
|
||||
}
|
||||
|
||||
PUPA_MOD_FINI
|
||||
GRUB_MOD_FINI
|
||||
{
|
||||
pupa_unregister_command ("cat");
|
||||
grub_unregister_command ("cat");
|
||||
}
|
||||
#endif /* ! PUPA_UTIL */
|
||||
#endif /* ! GRUB_UTIL */
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/* cmd.c - command to cmp an operating system */
|
||||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
*
|
||||
* PUPA is free software; you can redistribute it and/or modify
|
||||
* GRUB is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
|
@ -14,57 +14,57 @@
|
|||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with PUPA; if not, write to the Free Software
|
||||
* along with GRUB; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <pupa/normal.h>
|
||||
#include <pupa/dl.h>
|
||||
#include <pupa/arg.h>
|
||||
#include <pupa/misc.h>
|
||||
#include <pupa/file.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/arg.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/file.h>
|
||||
|
||||
static pupa_err_t
|
||||
pupa_cmd_cmp (struct pupa_arg_list *state __attribute__ ((unused)),
|
||||
static grub_err_t
|
||||
grub_cmd_cmp (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
pupa_file_t file1;
|
||||
pupa_file_t file2;
|
||||
grub_file_t file1;
|
||||
grub_file_t file2;
|
||||
|
||||
if (argc != 2)
|
||||
return pupa_error (PUPA_ERR_BAD_ARGUMENT, "two arguments required");
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "two arguments required");
|
||||
|
||||
pupa_printf ("Compare `%s' and `%s':\n", args[0],
|
||||
grub_printf ("Compare `%s' and `%s':\n", args[0],
|
||||
args[1]);
|
||||
|
||||
file1 = pupa_file_open (args[0]);
|
||||
file1 = grub_file_open (args[0]);
|
||||
if (! file1)
|
||||
return pupa_errno;
|
||||
return grub_errno;
|
||||
|
||||
file2 = pupa_file_open (args[1]);
|
||||
file2 = grub_file_open (args[1]);
|
||||
if (! file2)
|
||||
{
|
||||
pupa_file_close (file2);
|
||||
return pupa_errno;
|
||||
grub_file_close (file2);
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
if (pupa_file_size (file1) != pupa_file_size (file2))
|
||||
pupa_printf ("Differ in size: %d [%s], %d [%s]\n",
|
||||
pupa_file_size (file1), args[0],
|
||||
pupa_file_size (file2), args[1]);
|
||||
if (grub_file_size (file1) != grub_file_size (file2))
|
||||
grub_printf ("Differ in size: %d [%s], %d [%s]\n",
|
||||
grub_file_size (file1), args[0],
|
||||
grub_file_size (file2), args[1]);
|
||||
|
||||
else
|
||||
{
|
||||
char buf1[512];
|
||||
char buf2[512];
|
||||
pupa_ssize_t rd1, rd2;
|
||||
pupa_uint32_t pos = 0;
|
||||
grub_ssize_t rd1, rd2;
|
||||
grub_uint32_t pos = 0;
|
||||
|
||||
do
|
||||
{
|
||||
int i;
|
||||
rd1 = pupa_file_read (file1, buf1, 512);
|
||||
rd2 = pupa_file_read (file2, buf2, 512);
|
||||
rd1 = grub_file_read (file1, buf1, 512);
|
||||
rd2 = grub_file_read (file2, buf2, 512);
|
||||
|
||||
if (rd1 != rd2)
|
||||
return 0;
|
||||
|
|
@ -73,12 +73,12 @@ pupa_cmd_cmp (struct pupa_arg_list *state __attribute__ ((unused)),
|
|||
{
|
||||
if (buf1[i] != buf2[i])
|
||||
{
|
||||
pupa_printf ("Differ at the offset %d: 0x%x [%s], 0x%x [%s]\n",
|
||||
grub_printf ("Differ at the offset %d: 0x%x [%s], 0x%x [%s]\n",
|
||||
i + pos, buf1[i], args[0],
|
||||
buf2[i], args[1]);
|
||||
|
||||
pupa_file_close (file1);
|
||||
pupa_file_close (file2);
|
||||
grub_file_close (file1);
|
||||
grub_file_close (file2);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -87,38 +87,38 @@ pupa_cmd_cmp (struct pupa_arg_list *state __attribute__ ((unused)),
|
|||
} while (rd2);
|
||||
}
|
||||
|
||||
pupa_file_close (file1);
|
||||
pupa_file_close (file2);
|
||||
grub_file_close (file1);
|
||||
grub_file_close (file2);
|
||||
|
||||
pupa_printf ("The files are identical.\n");
|
||||
grub_printf ("The files are identical.\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#ifdef PUPA_UTIL
|
||||
#ifdef GRUB_UTIL
|
||||
void
|
||||
pupa_cmp_init (void)
|
||||
grub_cmp_init (void)
|
||||
{
|
||||
pupa_register_command ("cmp", pupa_cmd_cmp, PUPA_COMMAND_FLAG_BOTH,
|
||||
grub_register_command ("cmp", grub_cmd_cmp, GRUB_COMMAND_FLAG_BOTH,
|
||||
"cmp FILE1 FILE2", "Compare two files", 0);
|
||||
}
|
||||
|
||||
void
|
||||
pupa_cmp_fini (void)
|
||||
grub_cmp_fini (void)
|
||||
{
|
||||
pupa_unregister_command ("cmp");
|
||||
grub_unregister_command ("cmp");
|
||||
}
|
||||
#else /* ! PUPA_UTIL */
|
||||
PUPA_MOD_INIT
|
||||
#else /* ! GRUB_UTIL */
|
||||
GRUB_MOD_INIT
|
||||
{
|
||||
(void)mod; /* To stop warning. */
|
||||
pupa_register_command ("cmp", pupa_cmd_cmp, PUPA_COMMAND_FLAG_BOTH,
|
||||
grub_register_command ("cmp", grub_cmd_cmp, GRUB_COMMAND_FLAG_BOTH,
|
||||
"cmp FILE1 FILE2", "Compare two files", 0);
|
||||
}
|
||||
|
||||
PUPA_MOD_FINI
|
||||
GRUB_MOD_FINI
|
||||
{
|
||||
pupa_unregister_command ("cmp");
|
||||
grub_unregister_command ("cmp");
|
||||
}
|
||||
#endif /* ! PUPA_UTIL */
|
||||
#endif /* ! GRUB_UTIL */
|
||||
|
|
|
|||
168
commands/ls.c
168
commands/ls.c
|
|
@ -1,9 +1,9 @@
|
|||
/* ls.c - command to list files and devices */
|
||||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
*
|
||||
* PUPA is free software; you can redistribute it and/or modify
|
||||
* GRUB is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
|
@ -14,24 +14,24 @@
|
|||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with PUPA; if not, write to the Free Software
|
||||
* along with GRUB; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <pupa/types.h>
|
||||
#include <pupa/misc.h>
|
||||
#include <pupa/mm.h>
|
||||
#include <pupa/err.h>
|
||||
#include <pupa/dl.h>
|
||||
#include <pupa/normal.h>
|
||||
#include <pupa/arg.h>
|
||||
#include <pupa/disk.h>
|
||||
#include <pupa/device.h>
|
||||
#include <pupa/term.h>
|
||||
#include <pupa/machine/partition.h>
|
||||
#include <pupa/file.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/arg.h>
|
||||
#include <grub/disk.h>
|
||||
#include <grub/device.h>
|
||||
#include <grub/term.h>
|
||||
#include <grub/machine/partition.h>
|
||||
#include <grub/file.h>
|
||||
|
||||
static const struct pupa_arg_option options[] =
|
||||
static const struct grub_arg_option options[] =
|
||||
{
|
||||
{"long", 'l', 0, "Show a long list with more detailed information", 0, 0},
|
||||
{"human-readable", 'h', 0, "Print sizes in a human readable format", 0, 0},
|
||||
|
|
@ -39,105 +39,105 @@ static const struct pupa_arg_option options[] =
|
|||
{0, 0, 0, 0, 0, 0}
|
||||
};
|
||||
|
||||
static const char pupa_human_sizes[] = {' ', 'K', 'M', 'G', 'T'};
|
||||
static const char grub_human_sizes[] = {' ', 'K', 'M', 'G', 'T'};
|
||||
|
||||
static pupa_err_t
|
||||
pupa_ls_list_disks (int longlist)
|
||||
static grub_err_t
|
||||
grub_ls_list_disks (int longlist)
|
||||
{
|
||||
auto int pupa_ls_print_disks (const char *name);
|
||||
int pupa_ls_print_disks (const char *name)
|
||||
auto int grub_ls_print_disks (const char *name);
|
||||
int grub_ls_print_disks (const char *name)
|
||||
{
|
||||
pupa_device_t dev;
|
||||
auto int print_partition (const pupa_partition_t p);
|
||||
grub_device_t dev;
|
||||
auto int print_partition (const grub_partition_t p);
|
||||
|
||||
int print_partition (const pupa_partition_t p)
|
||||
int print_partition (const grub_partition_t p)
|
||||
{
|
||||
char *pname = pupa_partition_get_name (p);
|
||||
char *pname = grub_partition_get_name (p);
|
||||
|
||||
if (pname)
|
||||
{
|
||||
if (longlist)
|
||||
pupa_print_partinfo (dev, pname);
|
||||
grub_print_partinfo (dev, pname);
|
||||
else
|
||||
pupa_printf ("(%s,%s) ", name, pname);
|
||||
grub_printf ("(%s,%s) ", name, pname);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
dev = pupa_device_open (name);
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
dev = grub_device_open (name);
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
|
||||
if (dev)
|
||||
{
|
||||
if (longlist)
|
||||
pupa_printf ("Disk: %s\n", name);
|
||||
grub_printf ("Disk: %s\n", name);
|
||||
else
|
||||
pupa_printf ("(%s) ", name);
|
||||
grub_printf ("(%s) ", name);
|
||||
|
||||
if (dev->disk && dev->disk->has_partitions)
|
||||
{
|
||||
pupa_partition_iterate (dev->disk, print_partition);
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
grub_partition_iterate (dev->disk, print_partition);
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
pupa_device_close (dev);
|
||||
grub_device_close (dev);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
pupa_disk_dev_iterate (pupa_ls_print_disks);
|
||||
pupa_putchar ('\n');
|
||||
pupa_refresh ();
|
||||
grub_disk_dev_iterate (grub_ls_print_disks);
|
||||
grub_putchar ('\n');
|
||||
grub_refresh ();
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_ls_list_files (const char *dirname, int longlist, int all, int human)
|
||||
static grub_err_t
|
||||
grub_ls_list_files (const char *dirname, int longlist, int all, int human)
|
||||
{
|
||||
char *device_name;
|
||||
pupa_fs_t fs;
|
||||
grub_fs_t fs;
|
||||
char *path;
|
||||
pupa_device_t dev;
|
||||
grub_device_t dev;
|
||||
|
||||
static int print_files (const char *filename, int dir)
|
||||
{
|
||||
if (all || filename[0] != '.')
|
||||
pupa_printf ("%s%s ", filename, dir ? "/" : "");
|
||||
grub_printf ("%s%s ", filename, dir ? "/" : "");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int print_files_long (const char *filename, int dir)
|
||||
{
|
||||
char pathname[pupa_strlen (dirname) + pupa_strlen (filename) + 1];
|
||||
char pathname[grub_strlen (dirname) + grub_strlen (filename) + 1];
|
||||
|
||||
if ((! all) && (filename[0] == '.'))
|
||||
return 0;
|
||||
|
||||
if (! dir)
|
||||
{
|
||||
pupa_file_t file;
|
||||
grub_file_t file;
|
||||
|
||||
if (dirname[pupa_strlen (dirname) - 1] == '/')
|
||||
pupa_sprintf (pathname, "%s%s", dirname, filename);
|
||||
if (dirname[grub_strlen (dirname) - 1] == '/')
|
||||
grub_sprintf (pathname, "%s%s", dirname, filename);
|
||||
else
|
||||
pupa_sprintf (pathname, "%s/%s", dirname, filename);
|
||||
grub_sprintf (pathname, "%s/%s", dirname, filename);
|
||||
|
||||
/* XXX: For ext2fs symlinks are detected as files while they
|
||||
should be reported as directories. */
|
||||
file = pupa_file_open (pathname);
|
||||
file = grub_file_open (pathname);
|
||||
if (! file)
|
||||
{
|
||||
pupa_errno = 0;
|
||||
grub_errno = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (! human)
|
||||
pupa_printf ("%-12d", file->size);
|
||||
grub_printf ("%-12d", file->size);
|
||||
else
|
||||
{
|
||||
float fsize = file->size;
|
||||
|
|
@ -154,43 +154,43 @@ pupa_ls_list_files (const char *dirname, int longlist, int all, int human)
|
|||
|
||||
if (units)
|
||||
{
|
||||
pupa_sprintf (buf, "%0.2f%c", fsize, pupa_human_sizes[units]);
|
||||
pupa_printf ("%-12s", buf);
|
||||
grub_sprintf (buf, "%0.2f%c", fsize, grub_human_sizes[units]);
|
||||
grub_printf ("%-12s", buf);
|
||||
}
|
||||
else
|
||||
pupa_printf ("%-12d", file->size);
|
||||
grub_printf ("%-12d", file->size);
|
||||
|
||||
}
|
||||
(fs->close) (file);
|
||||
}
|
||||
else
|
||||
pupa_printf ("%-12s", "DIR");
|
||||
grub_printf ("%-12s", "DIR");
|
||||
|
||||
pupa_printf ("%s%s\n", filename, dir ? "/" : "");
|
||||
grub_printf ("%s%s\n", filename, dir ? "/" : "");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
device_name = pupa_file_get_device_name (dirname);
|
||||
dev = pupa_device_open (device_name);
|
||||
device_name = grub_file_get_device_name (dirname);
|
||||
dev = grub_device_open (device_name);
|
||||
if (! dev)
|
||||
goto fail;
|
||||
|
||||
fs = pupa_fs_probe (dev);
|
||||
path = pupa_strchr (dirname, '/');
|
||||
fs = grub_fs_probe (dev);
|
||||
path = grub_strchr (dirname, '/');
|
||||
|
||||
if (! path && ! device_name)
|
||||
{
|
||||
pupa_error (PUPA_ERR_BAD_ARGUMENT, "invalid argument");
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid argument");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (! path)
|
||||
{
|
||||
if (pupa_errno == PUPA_ERR_UNKNOWN_FS)
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
if (grub_errno == GRUB_ERR_UNKNOWN_FS)
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
|
||||
pupa_printf ("(%s): Filesystem is %s.\n",
|
||||
grub_printf ("(%s): Filesystem is %s.\n",
|
||||
device_name, fs ? fs->name : "unknown");
|
||||
}
|
||||
else if (fs)
|
||||
|
|
@ -199,64 +199,64 @@ pupa_ls_list_files (const char *dirname, int longlist, int all, int human)
|
|||
(fs->dir) (dev, path, print_files_long);
|
||||
else
|
||||
(fs->dir) (dev, path, print_files);
|
||||
pupa_putchar ('\n');
|
||||
pupa_refresh ();
|
||||
grub_putchar ('\n');
|
||||
grub_refresh ();
|
||||
}
|
||||
|
||||
fail:
|
||||
if (dev)
|
||||
pupa_device_close (dev);
|
||||
grub_device_close (dev);
|
||||
|
||||
pupa_free (device_name);
|
||||
grub_free (device_name);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_cmd_ls (struct pupa_arg_list *state, int argc, char **args)
|
||||
static grub_err_t
|
||||
grub_cmd_ls (struct grub_arg_list *state, int argc, char **args)
|
||||
{
|
||||
static int pupa_ls_print_files (const char *filename, int dir)
|
||||
static int grub_ls_print_files (const char *filename, int dir)
|
||||
{
|
||||
if (state[2].set/*all*/ || filename[0] != '.')
|
||||
pupa_printf ("%s%s ", filename, dir ? "/" : "");
|
||||
grub_printf ("%s%s ", filename, dir ? "/" : "");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (argc == 0)
|
||||
pupa_ls_list_disks (state[0].set);
|
||||
grub_ls_list_disks (state[0].set);
|
||||
else
|
||||
pupa_ls_list_files (args[0], state[0].set, state[2].set,
|
||||
grub_ls_list_files (args[0], state[0].set, state[2].set,
|
||||
state[1].set);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef PUPA_UTIL
|
||||
#ifdef GRUB_UTIL
|
||||
void
|
||||
pupa_ls_init (void)
|
||||
grub_ls_init (void)
|
||||
{
|
||||
pupa_register_command ("ls", pupa_cmd_ls, PUPA_COMMAND_FLAG_BOTH,
|
||||
grub_register_command ("ls", grub_cmd_ls, GRUB_COMMAND_FLAG_BOTH,
|
||||
"ls [OPTIONS...] [DIR]",
|
||||
"List devices and files", options);
|
||||
}
|
||||
|
||||
void
|
||||
pupa_ls_fini (void)
|
||||
grub_ls_fini (void)
|
||||
{
|
||||
pupa_unregister_command ("ls");
|
||||
grub_unregister_command ("ls");
|
||||
}
|
||||
#else /* ! PUPA_UTIL */
|
||||
PUPA_MOD_INIT
|
||||
#else /* ! GRUB_UTIL */
|
||||
GRUB_MOD_INIT
|
||||
{
|
||||
(void)mod; /* To stop warning. */
|
||||
pupa_register_command ("ls", pupa_cmd_ls, PUPA_COMMAND_FLAG_BOTH,
|
||||
grub_register_command ("ls", grub_cmd_ls, GRUB_COMMAND_FLAG_BOTH,
|
||||
"ls [OPTIONS...] [DIR]",
|
||||
"List devices and files", options);
|
||||
}
|
||||
|
||||
PUPA_MOD_FINI
|
||||
GRUB_MOD_FINI
|
||||
{
|
||||
pupa_unregister_command ("ls");
|
||||
grub_unregister_command ("ls");
|
||||
}
|
||||
#endif /* ! PUPA_UTIL */
|
||||
#endif /* ! GRUB_UTIL */
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/* terminal.c - command to show and select a terminal */
|
||||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
*
|
||||
* PUPA is free software; you can redistribute it and/or modify
|
||||
* GRUB is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
|
@ -14,34 +14,34 @@
|
|||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with PUPA; if not, write to the Free Software
|
||||
* along with GRUB; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <pupa/normal.h>
|
||||
#include <pupa/dl.h>
|
||||
#include <pupa/arg.h>
|
||||
#include <pupa/misc.h>
|
||||
#include <pupa/term.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/arg.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/term.h>
|
||||
|
||||
static pupa_err_t
|
||||
pupa_cmd_terminal (struct pupa_arg_list *state __attribute__ ((unused)),
|
||||
static grub_err_t
|
||||
grub_cmd_terminal (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
pupa_term_t term = 0;
|
||||
grub_term_t term = 0;
|
||||
|
||||
auto int print_terminal (pupa_term_t);
|
||||
auto int find_terminal (pupa_term_t);
|
||||
auto int print_terminal (grub_term_t);
|
||||
auto int find_terminal (grub_term_t);
|
||||
|
||||
int print_terminal (pupa_term_t t)
|
||||
int print_terminal (grub_term_t t)
|
||||
{
|
||||
pupa_printf (" %s", t->name);
|
||||
grub_printf (" %s", t->name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int find_terminal (pupa_term_t t)
|
||||
int find_terminal (grub_term_t t)
|
||||
{
|
||||
if (pupa_strcmp (t->name, args[0]) == 0)
|
||||
if (grub_strcmp (t->name, args[0]) == 0)
|
||||
{
|
||||
term = t;
|
||||
return 1;
|
||||
|
|
@ -52,48 +52,48 @@ pupa_cmd_terminal (struct pupa_arg_list *state __attribute__ ((unused)),
|
|||
|
||||
if (argc == 0)
|
||||
{
|
||||
pupa_printf ("Available terminal(s):");
|
||||
pupa_term_iterate (print_terminal);
|
||||
pupa_putchar ('\n');
|
||||
grub_printf ("Available terminal(s):");
|
||||
grub_term_iterate (print_terminal);
|
||||
grub_putchar ('\n');
|
||||
|
||||
pupa_printf ("Current terminal: %s\n", pupa_term_get_current ()->name);
|
||||
grub_printf ("Current terminal: %s\n", grub_term_get_current ()->name);
|
||||
}
|
||||
else
|
||||
{
|
||||
pupa_term_iterate (find_terminal);
|
||||
grub_term_iterate (find_terminal);
|
||||
if (! term)
|
||||
return pupa_error (PUPA_ERR_BAD_ARGUMENT, "no such terminal");
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no such terminal");
|
||||
|
||||
pupa_term_set_current (term);
|
||||
grub_term_set_current (term);
|
||||
}
|
||||
|
||||
return PUPA_ERR_NONE;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
||||
#ifdef PUPA_UTIL
|
||||
#ifdef GRUB_UTIL
|
||||
void
|
||||
pupa_terminal_init (void)
|
||||
grub_terminal_init (void)
|
||||
{
|
||||
pupa_register_command ("terminal", pupa_cmd_terminal, PUPA_COMMAND_FLAG_BOTH,
|
||||
grub_register_command ("terminal", grub_cmd_terminal, GRUB_COMMAND_FLAG_BOTH,
|
||||
"terminal [TERM...]", "Select a terminal.", 0);
|
||||
}
|
||||
|
||||
void
|
||||
pupa_terminal_fini (void)
|
||||
grub_terminal_fini (void)
|
||||
{
|
||||
pupa_unregister_command ("terminal");
|
||||
grub_unregister_command ("terminal");
|
||||
}
|
||||
#else /* ! PUPA_UTIL */
|
||||
PUPA_MOD_INIT
|
||||
#else /* ! GRUB_UTIL */
|
||||
GRUB_MOD_INIT
|
||||
{
|
||||
(void)mod; /* To stop warning. */
|
||||
pupa_register_command ("terminal", pupa_cmd_terminal, PUPA_COMMAND_FLAG_BOTH,
|
||||
grub_register_command ("terminal", grub_cmd_terminal, GRUB_COMMAND_FLAG_BOTH,
|
||||
"terminal [TERM...]", "Select a terminal.", 0);
|
||||
}
|
||||
|
||||
PUPA_MOD_FINI
|
||||
GRUB_MOD_FINI
|
||||
{
|
||||
pupa_unregister_command ("terminal");
|
||||
grub_unregister_command ("terminal");
|
||||
}
|
||||
#endif /* ! PUPA_UTIL */
|
||||
#endif /* ! GRUB_UTIL */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue