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

Migrate grub-mkimage.c to argp.

Browse source 
* Makefile.util.def (grub-mkimage): Add util/argp_common.c.
	(grub-setup): Likewise.
	* util/grub-setup.c (print_version): Move to ...
	* util/argp_common.c (print_version): ... here.
	* util/grub-setup.c (argp_program_version_hook): Move to ...
	* util/argp_common.c (argp_program_version_hook): ... here.
	* util/grub-setup.c (argp_parser): Add exit (1) on fatal error for
	safety.
	* util/grub-mkimage.c (main): Migrate to argp.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-03 21:18:37 +01:00
parent 57db0757f4
commit c76899a0ea
5 changed files with 257 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile.util.def
View file

@ -142,6 +142,8 @@ program = {
common = util/grub-mkimage.c;
common = util/resolve.c;
common = util/argp_common.c;
extra_dist = util/grub-mkimagexx.c;
ldadd = libgrubmods.a;
@ -314,6 +316,7 @@ program = {
mansection = 8;
common = util/grub-setup.c;
common = util/lvm.c;
common = util/argp_common.c;
common = grub-core/lib/reed_solomon.c;
sparc64_ieee1275 = util/ieee1275/ofpath.c;
@ -349,6 +352,7 @@ program = {
mansection = 1;
common = util/grub-mklayout.c;
common = util/argp_common.c;
ldadd = libgrubmods.a;
ldadd = libgrubgcry.a;
@ -502,6 +506,7 @@ script = {
script = {
name = grub-kbdcomp;
common = util/grub-kbdcomp.in;
mansection = 1;
};
script = {