grub: add grub variable update functionality
PATCH 1/1 grub: add grub variable update functionality
Please be aware I am NOT subscribed to grub-devel.
P.
---8<---
Customers and users of the kernel are commenting that there is no way to update a grub variable without copy and pasting the existing data.
For example,
[10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81 ignore_loglevel
[10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv - set kernelopts="root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81 ignore_loglevel newarg" [10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81 ignore_loglevel newarg
which is cumbersome.
Add functionality to add to an existing variable. For example,
[10:58 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81 ignore_loglevel [10:58 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv - set kernelopts+="newarg"
[10:59 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81 ignore_loglevel newarg
--- grub-core/lib/envblk.c | 61 +++++++++++++++++++++++++++++++++++++++ include/grub/lib/envblk.h | 1 + util/grub-editenv.c | 25 +++++++++++++++- 3 files changed, 86 insertions(+), 1 deletion(-)
grub-core/lib/envblk.c +61 -0
@@ -295,3 +295,64 @@ grub_envblk_iterate (grub_envblk_t envblk, p =find_next_line (p, pend); } } + +int +grub_envblk_add (grub_envblk_t envblk,const char *name,const char *add) +{ +char *current, *new, *ostart, *pstart, *pend; +int newsize, ret =1 ; + +/* get a copy of the existing entry */ + pstart = envblk->buf +sizeof (GRUB_ENVBLK_SIGNATURE ) -1 ; + pstart =grub_strstr (pstart, name); +if (!pstart) + { + ret =-1 ;/* existing entry not found */ + goto out; + } + pend =grub_strchr (pstart,'\n' ); +if (!pend || pend > (envblk->buf + envblk->size)) + { + ret =-1 ;/* existing entry not found */ + goto out; + } + + current =grub_zalloc (pend - pstart +1 ); +if (!current) + { + ret =-2 ;/* out of memory */ + goto out; + } +grub_strncpy (current, pstart, (int )(pend - pstart)); + + ostart =grub_strchr (current,'=' ); + ostart++; + +/* create a buffer for the updated entry. */ + newsize =grub_strlen (ostart) +grub_strlen (add) +2 ; + new =grub_zalloc (newsize); +if (!new) + { +return -2 ;/* out of memory */ + goto out; + } + +grub_strcpy (new, ostart); +grub_memcpy (new +grub_strlen (new)," " ,1 ); +grub_strcpy (new +grub_strlen (new), add); + +/* erase the current entry */ +grub_envblk_delete (envblk, name); +/* add the updated entry */ +if (!grub_envblk_set (envblk, name, new)) + { +/* restore the original entry. This should always work */ +grub_envblk_set (envblk, name, ostart); + ret =0 ; + } + +out: +grub_free (new); +grub_free (current); +return ret; +}
include/grub/lib/envblk.h +1 -0
@@ -37,6 +37,7 @@ void grub_envblk_delete (grub_envblk_t envblk, const char *name);void grub_envblk_iterate (grub_envblk_t envblk,void *hook_data,int hook (const char *name,const char *value,void *hook_data)); +int grub_envblk_add (grub_envblk_t envblk,const char *name,const char *add);void grub_envblk_close (grub_envblk_t envblk); static inline char *
util/grub-editenv.c +24 -1
@@ -210,15 +210,38 @@ set_variables (const char *name, int argc, char *argv[])while (argc) {char *p; +int add =0 ; p =strchr (argv[0 ],'=' );if (! p)grub_util_error (_ ("invalid parameter %s" ), argv[0 ]); +if ( *(p -1 ) =='+' ) + { + add =1 ; + *(p -1 ) =0 ; + } *(p++) =0 ; -if (!grub_envblk_set (envblk, argv[0 ], p)) +if (!add && !grub_envblk_set (envblk, argv[0 ], p))grub_util_error ("%s" ,_ ("environment block too small" )); +else if (add) { +int ret; + ret =grub_envblk_add (envblk, argv[0 ], p); +switch (ret) { +case (0 ): +grub_util_error ("%s" ,_ ("environment block too small" )); +break ; +case (-1 ): +grub_util_error ("%s" ,_ ("existing entry not found" )); +break ; +case (-2 ): +grub_util_error ("%s" ,_ ("out of memory error" )); +break ; +default : +break ; + } + } argc--; argv++;
Signature · 1 line
2.17.2
Just re-pinging on this ...
P.
Quoted 172 lines · Prarit Bhargava
Please be aware I am NOT subscribed to grub-devel.
P.
---8<---
Customers and users of the kernel are commenting that there is no way to update a grub variable without copy and pasting the existing data.
For example,
[10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevel
[10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv - set kernelopts="root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevelnewarg" [10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevelnewargwhich is cumbersome.
Add functionality to add to an existing variable. For example,
[10:58 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevel[10:58 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv - set kernelopts+="newarg"
[10:59 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevelnewargSigned-off-by Prarit Bhargava <[email protected]>--- grub-core/lib/envblk.c | 61 +++++++++++++++++++++++++++++++++++++++ include/grub/lib/envblk.h | 1 + util/grub-editenv.c | 25 +++++++++++++++- 3 files changed, 86 insertions(+), 1 deletion(-)grub-core/lib/envblk.c +61
-0@@ -295,3 +295,64 @@ grub_envblk_iterate (grub_envblk_t envblk, p =find_next_line (p, pend); } } + +int +grub_envblk_add (grub_envblk_t envblk,const char *name,const char *add) +{ +char *current, *new, *ostart, *pstart, *pend; +int newsize, ret =1 ; + +/* get a copy of the existing entry */ + pstart = envblk->buf +sizeof (GRUB_ENVBLK_SIGNATURE ) -1 ; + pstart =grub_strstr (pstart, name); +if (!pstart) + { + ret =-1 ;/* existing entry not found */ + goto out; + } + pend =grub_strchr (pstart,'\n' ); +if (!pend || pend > (envblk->buf + envblk->size)) + { + ret =-1 ;/* existing entry not found */ + goto out; + } + + current =grub_zalloc (pend - pstart +1 ); +if (!current) + { + ret =-2 ;/* out of memory */ + goto out; + } +grub_strncpy (current, pstart, (int )(pend - pstart)); + + ostart =grub_strchr (current,'=' ); + ostart++; + +/* create a buffer for the updated entry. */ + newsize =grub_strlen (ostart) +grub_strlen (add) +2 ; + new =grub_zalloc (newsize); +if (!new) + { +return -2 ;/* out of memory */ + goto out; + } + +grub_strcpy (new, ostart); +grub_memcpy (new +grub_strlen (new)," " ,1 ); +grub_strcpy (new +grub_strlen (new), add); + +/* erase the current entry */ +grub_envblk_delete (envblk, name); +/* add the updated entry */ +if (!grub_envblk_set (envblk, name, new)) + { +/* restore the original entry. This should always work */ +grub_envblk_set (envblk, name, ostart); + ret =0 ; + } + +out: +grub_free (new); +grub_free (current); +return ret; +}include/grub/lib/envblk.h +1
-0@@ -37,6 +37,7 @@ void grub_envblk_delete (grub_envblk_t envblk, const char *name);void grub_envblk_iterate (grub_envblk_t envblk,void *hook_data,int hook (const char *name,const char *value,void *hook_data)); +int grub_envblk_add (grub_envblk_t envblk,const char *name,const char *add);void grub_envblk_close (grub_envblk_t envblk); static inline char *util/grub-editenv.c +24
-1@@ -210,15 +210,38 @@ set_variables (const char *name, int argc, char *argv[])while (argc) {char *p; +int add =0 ; p =strchr (argv[0 ],'=' );if (! p)grub_util_error (_ ("invalid parameter %s" ), argv[0 ]); +if ( *(p -1 ) =='+' ) + { + add =1 ; + *(p -1 ) =0 ; + } *(p++) =0 ; -if (!grub_envblk_set (envblk, argv[0 ], p)) +if (!add && !grub_envblk_set (envblk, argv[0 ], p))grub_util_error ("%s" ,_ ("environment block too small" )); +else if (add) { +int ret; + ret =grub_envblk_add (envblk, argv[0 ], p); +switch (ret) { +case (0 ): +grub_util_error ("%s" ,_ ("environment block too small" )); +break ; +case (-1 ): +grub_util_error ("%s" ,_ ("existing entry not found" )); +break ; +case (-2 ): +grub_util_error ("%s" ,_ ("out of memory error" )); +break ; +default : +break ; + } + } argc--; argv++;
Quoted 51 lines · Prarit Bhargava
Please be aware I am NOT subscribed to grub-devel.
P.
---8<---
Customers and users of the kernel are commenting that there is no way to update a grub variable without copy and pasting the existing data.
For example,
[10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevel
[10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv - set kernelopts="root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevelnewarg" [10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevelnewargwhich is cumbersome.
Add functionality to add to an existing variable. For example,
[10:58 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevel[10:58 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv - set kernelopts+="newarg"
[10:59 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevelnewargSigned-off-by Prarit Bhargava <[email protected]>--- grub-core/lib/envblk.c | 61 +++++++++++++++++++++++++++++++++++++++ include/grub/lib/envblk.h | 1 + util/grub-editenv.c | 25 +++++++++++++++- 3 files changed, 86 insertions(+), 1 deletion(-)grub-core/lib/envblk.c +0
-0
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 300
Quoted 6 lines
grub-core/lib/envblk.c +3
-0@@ -295,3 +295,64 @@ grub_envblk_iterate (grub_envblk_t envblk, p =find_next_line (p, pend); } } + +int +grub_envblk_add (grub_envblk_t envblk,const char *name,const char *add)
s/grub_envblk_add/grub_envblk_extend/?
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 307
Quoted 7 lines
grub-core/lib/envblk.c +7
-0+{ +char *current, *new, *ostart, *pstart, *pend; +int newsize, ret =1 ; + +/* get a copy of the existing entry */ + pstart = envblk->buf +sizeof (GRUB_ENVBLK_SIGNATURE ) -1 ; + pstart =grub_strstr (pstart, name);
grub_strcmp() instead of grub_strstr()?
Even if not what will happen if e.g. env file contains this line among others:
xyx=kernelopts
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 311
Quoted 4 lines
grub-core/lib/envblk.c +4
-0+if (!pstart) + { + ret =-1 ;/* existing entry not found */ + goto out;
s/out/err/
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 313
Quoted 2 lines
grub-core/lib/envblk.c +2
-0+ } + pend =grub_strchr (pstart,'\n' );
If grub_strcmp() then you do not need this...
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 326
Quoted 13 lines
grub-core/lib/envblk.c +13
-0+if (!pend || pend > (envblk->buf + envblk->size)) + { + ret =-1 ;/* existing entry not found */ + goto out; + } + + current =grub_zalloc (pend - pstart +1 ); +if (!current) + { + ret =-2 ;/* out of memory */ + goto out; + } +grub_strncpy (current, pstart, (int )(pend - pstart));
Do we need (int) cast here?
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 331
Quoted 4 lines
grub-core/lib/envblk.c +4
-0+ ostart =grub_strchr (current,'=' ); + ostart++; + +/* create a buffer for the updated entry. */
Please start all comments with capital letter.
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 333
Quoted 2 lines
grub-core/lib/envblk.c +2
-0+ newsize =grub_strlen (ostart) +grub_strlen (add) +2 ; + new =grub_zalloc (newsize);
You do not need newsize here. Please drop it.
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 336
Quoted 3 lines
grub-core/lib/envblk.c +3
-0+if (!new) + { +return -2 ;/* out of memory */
May I ask you to use proper GRUB errors, e.g. GRUB_ERR_OUT_OF_MEMORY here. Please take a look at include/grub/err.h for more details.
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 342
Quoted 6 lines
grub-core/lib/envblk.c +6
-0+ goto out; + } + +grub_strcpy (new, ostart); +grub_memcpy (new +grub_strlen (new)," " ,1 ); +grub_strcpy (new +grub_strlen (new), add);
grub_snprintf() is your friend.
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 351
Quoted 8 lines
grub-core/lib/envblk.c +8
-0+/* erase the current entry */ +grub_envblk_delete (envblk, name); +/* add the updated entry */ +if (!grub_envblk_set (envblk, name, new)) + { +/* restore the original entry. This should always work */ +grub_envblk_set (envblk, name, ostart); + ret =0 ;
s/0/GRUB_ERR_NONE/
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 354
Quoted 3 lines
grub-core/lib/envblk.c +3
-0+ } + +out:
One space before label please.
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 357
Quoted 3 lines
grub-core/lib/envblk.c +3
-0+grub_free (new); +grub_free (current); +return ret;
Please add empty line before return.
Quoted 18 lines
grub-core/lib/envblk.c +1
-0+}include/grub/lib/envblk.h +1
-0@@ -37,6 +37,7 @@ void grub_envblk_delete (grub_envblk_t envblk, const char *name);void grub_envblk_iterate (grub_envblk_t envblk,void *hook_data,int hook (const char *name,const char *value,void *hook_data)); +int grub_envblk_add (grub_envblk_t envblk,const char *name,const char *add);void grub_envblk_close (grub_envblk_t envblk); static inline char *util/grub-editenv.c +0
-0
util/grub-editenv.c set_variables (const char *name, int argc, char *argv[]) · line 219
Quoted 10 lines
util/grub-editenv.c +2
-0@@ -210,15 +210,38 @@ set_variables (const char *name, int argc, char *argv[])while (argc) {char *p; +int add =0 ; p =strchr (argv[0 ],'=' );if (! p)grub_util_error (_ ("invalid parameter %s" ), argv[0 ]); +if ( *(p -1 ) =='+' )
This is not safe. What will happen if "p" points to the first character in argv[0]?
util/grub-editenv.c set_variables (const char *name, int argc, char *argv[]) · line 222
Quoted 3 lines
util/grub-editenv.c +3
-0+ { + add =1 ; + *(p -1 ) =0 ;
I am not sure why you need to zero this. Anyway, I think that you do not need "add" variable and code can be optimized further. IMO you can use one "if" and "continue". This should suffice to differentiate between set and add/extend cases.
Quoted 8 lines
util/grub-editenv.c +4
-1+ } *(p++) =0 ; -if (!grub_envblk_set (envblk, argv[0 ], p)) +if (!add && !grub_envblk_set (envblk, argv[0 ], p))grub_util_error ("%s" ,_ ("environment block too small" )); +else if (add) { +int ret;
util/grub-editenv.c set_variables (const char *name, int argc, char *argv[]) · line 239
Quoted 10 lines
util/grub-editenv.c +10
-0+ ret =grub_envblk_add (envblk, argv[0 ], p); +switch (ret) { +case (0 ): +grub_util_error ("%s" ,_ ("environment block too small" )); +break ; +case (-1 ): +grub_util_error ("%s" ,_ ("existing entry not found" )); +break ; +case (-2 ): +grub_util_error ("%s" ,_ ("out of memory error" ));
Please put "default:" here and drop everything below.
util/grub-editenv.c set_variables (const char *name, int argc, char *argv[]) · line 244
Quoted 5 lines
util/grub-editenv.c +5
-0+break ; +default : +break ; + } + }
Daniel
Prarit Bhargava
AppliedQuoted 47 lines · Daniel Kiper
Quoted 46 lines · Prarit Bhargava
Please be aware I am NOT subscribed to grub-devel.
P.
---8<---
Customers and users of the kernel are commenting that there is no way to update a grub variable without copy and pasting the existing data.
For example,
[10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevel
[10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv - set kernelopts="root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevelnewarg" [10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevelnewargwhich is cumbersome.
Add functionality to add to an existing variable. For example,
[10:58 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevel[10:58 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv - set kernelopts+="newarg"
[10:59 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list
saved_entry=0
next_entry=
kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81ignore_loglevelnewargSigned-off-by Prarit Bhargava <[email protected]>--- grub-core/lib/envblk.c | 61 +++++++++++++++++++++++++++++++++++++++ include/grub/lib/envblk.h | 1 + util/grub-editenv.c | 25 +++++++++++++++- 3 files changed, 86 insertions(+), 1 deletion(-)
Quoted 13 lines
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 300
Quoted 11 lines
grub-core/lib/envblk.c +3
-0@@ -295,3 +295,64 @@ grub_envblk_iterate (grub_envblk_t envblk, p =find_next_line (p, pend); } } + +int +grub_envblk_add (grub_envblk_t envblk,const char *name,const char *add)s/grub_envblk_add/grub_envblk_extend/?
Hi Daniel, thanks for the valuable feedback.
After reading your comments I saw that using grub_envblk_iterate() to modify the entry was easier than attempting to parse everything myself. I've added that to my v2. Unfortunately this means I'm skipping over some of your comments which are no longer applicable to v2.
Quoted 13 lines
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 307
Quoted 8 lines
grub-core/lib/envblk.c +7
-0+{ +char *current, *new, *ostart, *pstart, *pend; +int newsize, ret =1 ; + +/* get a copy of the existing entry */ + pstart = envblk->buf +sizeof (GRUB_ENVBLK_SIGNATURE ) -1 ; + pstart =grub_strstr (pstart, name);
grub_strcmp()instead ofgrub_strstr()?Even if not what will happen if e.g. env file contains this line among others:
Quoted 8 lines
xyx=kernelopts
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 311
Quoted 4 lines
grub-core/lib/envblk.c +4
-0+if (!pstart) + { + ret =-1 ;/* existing entry not found */ + goto out;s/out/err/
Applied to v2.
Quoted 20 lines
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 313
Quoted 3 lines
grub-core/lib/envblk.c +2
-0+ } + pend =grub_strchr (pstart,'\n' );If
grub_strcmp()then you do not need this...grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 326
Quoted 13 lines
grub-core/lib/envblk.c +13
-0+if (!pend || pend > (envblk->buf + envblk->size)) + { + ret =-1 ;/* existing entry not found */ + goto out; + } + + current =grub_zalloc (pend - pstart +1 ); +if (!current) + { + ret =-2 ;/* out of memory */ + goto out; + } +grub_strncpy (current, pstart, (int )(pend - pstart));
Quoted 8 lines
Do we need (int) cast here?
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 331
Quoted 4 lines
grub-core/lib/envblk.c +4
-0+ ostart =grub_strchr (current,'=' ); + ostart++; + +/* create a buffer for the updated entry. */ Please start all comments with capital letter.
Applied to v2.
Quoted 5 lines
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 333
Quoted 3 lines
grub-core/lib/envblk.c +2
-0+ newsize =grub_strlen (ostart) +grub_strlen (add) +2 ; + new =grub_zalloc (newsize);You do not need newsize here. Please drop it.
Applied to v2.
Quoted 8 lines
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 336
Quoted 4 lines
grub-core/lib/envblk.c +3
-0+if (!new) + { +return -2 ;/* out of memory */ May I ask you to use proper GRUB errors, e.g.
GRUB_ERR_OUT_OF_MEMORYhere. Please take a look atinclude/grub/err.hfor more details.
Applied to v2.
Quoted 8 lines
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 342
Quoted 6 lines
grub-core/lib/envblk.c +6
-0+ goto out; + } + +grub_strcpy (new, ostart); +grub_memcpy (new +grub_strlen (new)," " ,1 ); +grub_strcpy (new +grub_strlen (new), add);
grub_snprintf()is your friend.
:) Applied to v2. and "Duh." :)
Quoted 10 lines
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 351
Quoted 9 lines
grub-core/lib/envblk.c +8
-0+/* erase the current entry */ +grub_envblk_delete (envblk, name); +/* add the updated entry */ +if (!grub_envblk_set (envblk, name, new)) + { +/* restore the original entry. This should always work */ +grub_envblk_set (envblk, name, ostart); + ret =0 ;
Quoted 2 lines
s/0/GRUB_ERR_NONE/
Applied to v2.
Quoted 5 lines
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 354
Quoted 3 lines
grub-core/lib/envblk.c +3
-0+ } + +out:One space before label please.
Applied to v2.
Quoted 6 lines
grub-core/lib/envblk.c grub_envblk_iterate (grub_envblk_t envblk, · line 357
Quoted 4 lines
grub-core/lib/envblk.c +3
-0+grub_free (new); +grub_free (current); +return ret;Please add empty line before return.
Applied to v2.
Quoted 32 lines
Quoted 19 lines
grub-core/lib/envblk.c +1
-0+}include/grub/lib/envblk.h +1
-0@@ -37,6 +37,7 @@ void grub_envblk_delete (grub_envblk_t envblk, const char *name);void grub_envblk_iterate (grub_envblk_t envblk,void *hook_data,int hook (const char *name,const char *value,void *hook_data)); +int grub_envblk_add (grub_envblk_t envblk,const char *name,const char *add);void grub_envblk_close (grub_envblk_t envblk); static inline char *util/grub-editenv.c +0
-0util/grub-editenv.c set_variables (const char *name, int argc, char *argv[]) · line 219
Quoted 10 lines
util/grub-editenv.c +2
-0@@ -210,15 +210,38 @@ set_variables (const char *name, int argc, char *argv[])while (argc) {char *p; +int add =0 ; p =strchr (argv[0 ],'=' );if (! p)grub_util_error (_ ("invalid parameter %s" ), argv[0 ]); +if ( *(p -1 ) =='+' )This is not safe. What will happen if "p" points to the first character in argv[0]?
Quoted 8 lines
util/grub-editenv.c set_variables (const char *name, int argc, char *argv[]) · line 222
Quoted 3 lines
util/grub-editenv.c +3
-0+ { + add =1 ; + *(p -1 ) =0 ;I am not sure why you need to zero this. Anyway, I think that you do not need "add" variable and code can be optimized further. IMO you can use one "if" and "continue". This should suffice to differentiate between set and add/extend cases.
The commandline is
./grub-editenv - set prarit="hello"
which results in
prarit=hello
In this case argv[0] is 'prarit=hello' and we really want to pass only 'prarit' as the argument. The simple way this is done in the existing code is to write a '0' to the equal sign.
Similarly,
./grub-editenv - set prarit+="hello"
I need to write a 0 to the plus sign and the equal sign, ie
*(p - 1) = 0;
*(p++) = 0;While correct it is confusing to look at :). I'll think of another option for v2.
P.
Quoted 30 lines
Quoted 9 lines
util/grub-editenv.c +4
-1+ } *(p++) =0 ; -if (!grub_envblk_set (envblk, argv[0 ], p)) +if (!add && !grub_envblk_set (envblk, argv[0 ], p))grub_util_error ("%s" ,_ ("environment block too small" )); +else if (add) { +int ret;util/grub-editenv.c set_variables (const char *name, int argc, char *argv[]) · line 239
Quoted 10 lines
util/grub-editenv.c +10
-0+ ret =grub_envblk_add (envblk, argv[0 ], p); +switch (ret) { +case (0 ): +grub_util_error ("%s" ,_ ("environment block too small" )); +break ; +case (-1 ): +grub_util_error ("%s" ,_ ("existing entry not found" )); +break ; +case (-2 ): +grub_util_error ("%s" ,_ ("out of memory error" ));Please put "default:" here and drop everything below.
util/grub-editenv.c set_variables (const char *name, int argc, char *argv[]) · line 244
Quoted 5 lines
util/grub-editenv.c +5
-0+break ; +default : +break ; + } + }Daniel