[prev in list] [next in list] [prev in thread] [next in thread] 

List:       hurd-bug
Subject:    Re: preliminary patch for initrd support in Mach
From:       Samuel Thibault <samuel.thibault () gnu ! org>
Date:       2010-07-31 14:49:08
Message-ID: 20100731144908.GN4824 () const ! famille ! thibault ! fr
[Download RAW message or body]

Jérémie Koenig, le Sat 12 Jun 2010 19:05:20 +0200, a écrit :
> @@ -128,7 +129,7 @@
>      }
>    else
>      {
> -      int i, losers, maxlen;
> +      int i, losers;
>  
>        /* Initialize boot script variables.  We leak these send rights.  */
>        losers = boot_script_set_variable
> @@ -219,23 +220,19 @@
>        }
>  #endif
>  
> -      maxlen = 0;
>        for (i = 0; i < boot_info.mods_count; ++i)
>  	{
>  	  int err;
>  	  char *line = (char*)phystokv(bmods[i].string);
> -	  int len = strlen (line) + 1;
> -	  if (len > maxlen)
> -	    maxlen = len;
> -	  printf ("\rmodule %d: %*s", i, -maxlen, line);
> +	  printf ("module %d: %s\n", i, line);
>  	  err = boot_script_parse_line (&bmods[i], line);
>  	  if (err)
>  	    {
> -	      printf ("\n\tERROR: %s", boot_script_error_string (err));
> +	      printf ("\tERROR: %s\n", boot_script_error_string (err));
>  	      ++losers;
>  	    }
>  	}
> -      printf ("\r%d multiboot modules %*s", i, -maxlen, "");
> +      printf ("%d multiboot modules\n", i);
>        if (losers)
>  	panic ("%d of %d boot script commands could not be parsed",
>  	       losers, boot_info.mods_count);

These seem unrelated, right?  I guess they should be submitted and
commited upstream separately.

I have commited the patch, without the change above, in the Debian
package.

Samuel


[prev in list] [next in list] [prev in thread] [next in thread]