vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2004-04-04 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
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 2004-04-04 13:46:03 +00:00
parent 6a1425510d
commit 4b13b216f4
125 changed files with 6198 additions and 6181 deletions
Download patch file Download diff file Expand all files Collapse all files

88
commands/cmp.c
View file

@ -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 */