[PATCH] util/grub-mkrescue: Fix copy/paste issue referencing mdadm

[PATCH] util/grub-mkrescue: Fix copy/paste issue referencing mdadm

[Glenn Washburn]

The check_xorriso() function appears to have been copy/pasted from
somewhere that was originally checking the mdadm command. So the file
handle to the output of the xorriso command is named 'mdadm'. Instead
rename it to the more generic 'fout'. Also change a comment referencing
mdadm to reference xorriso.

Signed-off-by: Glenn Washburn <development@efficientek.com>
---
 util/grub-mkrescue.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
index 6dc71a8a1628..951b17b8edb9 100644
--- a/util/grub-mkrescue.c
+++ b/util/grub-mkrescue.c
@@ -339,7 +339,7 @@ check_xorriso (const char *val)
   const char *argv[5];
   int fd;
   pid_t pid;
-  FILE *mdadm;
+  FILE *fout;
   char *buf = NULL;
   size_t len = 0;
   int ret = 0;
@@ -356,12 +356,12 @@ check_xorriso (const char *val)
   if (!pid)
     return 0;
 
-  /* Parent.  Read mdadm's output.  */
-  mdadm = fdopen (fd, "r");
-  if (! mdadm)
+  /* Parent.  Read xorriso's output.  */
+  fout = fdopen (fd, "r");
+  if (! fout)
     return 0;
 
-  while (getline (&buf, &len, mdadm) > 0)
+  while (getline (&buf, &len, fout) > 0)
     {
       if (grub_strstr (buf, val))
 	ret = 1;
-- 
2.34.1


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH] util/grub-mkrescue: Fix copy/paste issue referencing mdadm

[Sudhakar Kuppusamy]

> On 17 Nov 2025, at 12:23 PM, Glenn Washburn <development@efficientek.com> wrote:
> 
> The check_xorriso() function appears to have been copy/pasted from
> somewhere that was originally checking the mdadm command. So the file
> handle to the output of the xorriso command is named 'mdadm'. Instead
> rename it to the more generic 'fout'. Also change a comment referencing
> mdadm to reference xorriso.
> 
> Signed-off-by: Glenn Washburn <development@efficientek.com>

Reviewed-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>


Thanks,
Sudhakar  
> ---
> util/grub-mkrescue.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
> index 6dc71a8a1628..951b17b8edb9 100644
> --- a/util/grub-mkrescue.c
> +++ b/util/grub-mkrescue.c
> @@ -339,7 +339,7 @@ check_xorriso (const char *val)
>   const char *argv[5];
>   int fd;
>   pid_t pid;
> -  FILE *mdadm;
> +  FILE *fout;
>   char *buf = NULL;
>   size_t len = 0;
>   int ret = 0;
> @@ -356,12 +356,12 @@ check_xorriso (const char *val)
>   if (!pid)
>     return 0;
> 
> -  /* Parent.  Read mdadm's output.  */
> -  mdadm = fdopen (fd, "r");
> -  if (! mdadm)
> +  /* Parent.  Read xorriso's output.  */
> +  fout = fdopen (fd, "r");
> +  if (! fout)
>     return 0;
> 
> -  while (getline (&buf, &len, mdadm) > 0)
> +  while (getline (&buf, &len, fout) > 0)
>     {
>       if (grub_strstr (buf, val))
> ret = 1;
> -- 
> 2.34.1
> 
> 
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH] util/grub-mkrescue: Fix copy/paste issue referencing mdadm

[Daniel Kiper]

On Mon, Nov 17, 2025 at 05:16:06PM +0530, Sudhakar Kuppusamy wrote:
> > On 17 Nov 2025, at 12:23 PM, Glenn Washburn <development@efficientek.com> wrote:
> >
> > The check_xorriso() function appears to have been copy/pasted from
> > somewhere that was originally checking the mdadm command. So the file
> > handle to the output of the xorriso command is named 'mdadm'. Instead
> > rename it to the more generic 'fout'. Also change a comment referencing
> > mdadm to reference xorriso.
> >
> > Signed-off-by: Glenn Washburn <development@efficientek.com>
>
> Reviewed-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel