patch-2.2.16 linux/arch/alpha/lib/srm_printk.c

• Lines: 36
• Date: Wed Jun 7 14:26:42 2000
• Orig file: v2.2.15/linux/arch/alpha/lib/srm_printk.c
• Orig date: Mon Oct 12 11:40:12 1998

diff -urN v2.2.15/linux/arch/alpha/lib/srm_printk.c linux/arch/alpha/lib/srm_printk.c
@@ -10,12 +10,31 @@
 {
 	static char buf[1024];
         va_list args;
-        long i;
+        long len, num_lf;
+        char *src, *dst;
 
         va_start(args, fmt);
-        i = vsprintf(buf,fmt,args);
+        len = vsprintf(buf, fmt, args);
         va_end(args);
 
-	srm_puts(buf);	
-        return i;
+        /* Count number of linefeeds in string. */
+        num_lf = 0;
+        for (src = buf; *src; ++src) {
+                if (*src == '\n') {
+                        ++num_lf;
+                }
+        }
+
+	/* Expand each linefeed into carriage-return/linefeed. */
+        if (num_lf) {
+                for (dst = src + num_lf; src >= buf; ) {
+                        if (*src == '\n') {
+                                *dst-- = '\r';
+                        }
+                        *dst-- = *src--;
+                }
+        }
+
+	srm_puts(buf, num_lf+len);	
+        return len;
 }