patch-2.4.0-test2 linux/arch/alpha/lib/srm_printk.c

• Lines: 41
• Date: Mon Jun 19 17:59:33 2000
• Orig file: v2.4.0-test1/linux/arch/alpha/lib/srm_printk.c
• Orig date: Mon Oct 12 11:40:12 1998

diff -u --recursive --new-file v2.4.0-test1/linux/arch/alpha/lib/srm_printk.c linux/arch/alpha/lib/srm_printk.c
@@ -9,13 +9,33 @@
 srm_printk(const char *fmt, ...)
 {
 	static char buf[1024];
-        va_list args;
-        long i;
+	va_list args;
+	long len, num_lf;
+	char *src, *dst;
 
-        va_start(args, fmt);
-        i = vsprintf(buf,fmt,args);
-        va_end(args);
+	va_start(args, fmt);
+	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;
+		}
+	}
+
+	if (num_lf) {
+		/* expand each linefeed into carriage-return/linefeed: */
+		for (dst = src + num_lf; src >= buf; ) {
+			if (*src == '\n') {
+				*dst-- = '\r';
+			}
+			*dst-- = *src--;
+		}
+	}
+
+	srm_puts(buf, num_lf+len);	
+        return len;
 }