Re: [PATCH] Altix console mod

[Andreas Schwab <schwab@suse.de>]

Pat Gefre <pfg@sgi.com> writes:

> @@ -978,19 +981,21 @@
>   * ia64_sn_console_putb (what sal_puts_raw below actually does).
>   *
>   */
> -static void puts_raw_fixed(const char *s, int count)
> +
> +static void puts_raw_fixed(int (*puts_raw) (const char *s, int len), const char *s, int count)
>  {
>  	const char *s1;
> -	struct sn_cons_port *port = &sal_console_port;
>  
>  	/* Output '\r' before each '\n' */
>  	while ((s1 = memchr(s, '\n', count)) != NULL) {
> -		port->sc_ops->sal_puts_raw(s, s1 - s);
> -		port->sc_ops->sal_puts_raw("\r\n", 2);
> +		if ( (*(s1 - 1) != '\r') && (*(s1 + 1) != '\r') ) {
> +			puts_raw(s, s1 - s);
> +			puts_raw("\r\n", 2);
> +		}

You have now broken output when a CR actually appears in the string.
What's wrong with unconditionally writing a CR before each LF?  That's
what every other console print function is doing.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."