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

* util/grub-editenv.c (create_envblk_file): More from here ... 

* util/editenv.c (grub_util_create_envblk_file): ... to here.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-15 21:23:54 +02:00
parent f7c4957068
commit bacfefbb0e
5 changed files with 76 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-15 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-editenv.c (create_envblk_file): More from here ...
* util/editenv.c (grub_util_create_envblk_file): ... to here.
2013-10-15 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/osdep/unix/getroot.c (grub_guess_root_devices):

1
Makefile.util.def
View File

@ -213,6 +213,7 @@ program = {
mansection = 1;
common = util/grub-editenv.c;
common = util/editenv.c;
common = grub-core/osdep/init.c;
ldadd = libgrubmods.a;

3
include/grub/util/install.h
View File

@ -76,4 +76,7 @@ grub_install_get_blocklist (grub_device_t root_dev,
void *data),
void *hook_data);
void
grub_util_create_envblk_file (const char *name);
#endif

63
util/editenv.c Normal file
View File

@ -0,0 +1,63 @@
/* editenv.c - tool to edit environment block. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2008,2009,2010,2013 Free Software Foundation, Inc.
*
* 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 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include <grub/types.h>
#include <grub/emu/misc.h>
#include <grub/util/misc.h>
#include <grub/lib/envblk.h>
#include <grub/i18n.h>
#include <grub/emu/hostfile.h>
#include <errno.h>
#include <string.h>
#define DEFAULT_ENVBLK_SIZE 1024
void
grub_util_create_envblk_file (const char *name)
{
FILE *fp;
char *buf;
char *namenew;
buf = xmalloc (DEFAULT_ENVBLK_SIZE);
namenew = xasprintf ("%s.new", name);
fp = grub_util_fopen (namenew, "wb");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), namenew,
strerror (errno));
memcpy (buf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);
memset (buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1, '#',
DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) + 1);
if (fwrite (buf, 1, DEFAULT_ENVBLK_SIZE, fp) != DEFAULT_ENVBLK_SIZE)
grub_util_error (_("cannot write to `%s': %s"), namenew,
strerror (errno));
fsync (fileno (fp));
free (buf);
fclose (fp);
if (rename (namenew, name) < 0)
grub_util_error (_("cannot rename the file %s to %s"), namenew, name);
free (namenew);
}

40
util/grub-editenv.c
View File

@ -23,7 +23,8 @@
#include <grub/util/misc.h>
#include <grub/lib/envblk.h>
#include <grub/i18n.h>
#include <grub/osdep/hostfile.h>
#include <grub/emu/hostfile.h>
#include <grub/util/install.h>
#include <stdio.h>
#include <unistd.h>
@ -33,7 +34,6 @@
#include "progname.h"
#define DEFAULT_ENVBLK_SIZE 1024
#define DEFAULT_ENVBLK_PATH DEFAULT_DIRECTORY "/" GRUB_ENVBLK_DEFCFG
static struct argp_option options[] = {
@ -109,38 +109,6 @@ If FILENAME is `-', the default value %s is used."),
NULL, help_filter, NULL
};
static void
create_envblk_file (const char *name)
{
FILE *fp;
char *buf;
char *namenew;
buf = xmalloc (DEFAULT_ENVBLK_SIZE);
namenew = xasprintf ("%s.new", name);
fp = grub_util_fopen (namenew, "wb");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), namenew,
strerror (errno));
memcpy (buf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);
memset (buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1, '#',
DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) + 1);
if (fwrite (buf, 1, DEFAULT_ENVBLK_SIZE, fp) != DEFAULT_ENVBLK_SIZE)
grub_util_error (_("cannot write to `%s': %s"), namenew,
strerror (errno));
fsync (fileno (fp));
free (buf);
fclose (fp);
if (rename (namenew, name) < 0)
grub_util_error (_("cannot rename the file %s to %s"), namenew, name);
free (namenew);
}
static grub_envblk_t
open_envblk_file (const char *name)
{
@ -153,7 +121,7 @@ open_envblk_file (const char *name)
if (! fp)
{
/* Create the file implicitly. */
create_envblk_file (name);
grub_util_create_envblk_file (name);
fp = grub_util_fopen (name, "rb");
if (! fp)
grub_util_error (_("cannot open `%s': %s"), name,
@ -299,7 +267,7 @@ main (int argc, char *argv[])
}
if (strcmp (command, "create") == 0)
create_envblk_file (filename);
grub_util_create_envblk_file (filename);
else if (strcmp (command, "list") == 0)
list_variables (filename);
else if (strcmp (command, "set") == 0)