2006-10-11 Denis Pilat <denis.pilat@st.com>

* tui/tui-source.c (tui_set_source_content): handle source
	files that contain non unix end-of-line.

gdb/ChangeLog

@@ -1,3 +1,8 @@
+2006-10-11  Denis Pilat  <denis.pilat@st.com>
+
+	* tui/tui-source.c (tui_set_source_content): handle source 
+	files that contain non unix end-of-line.
+	
 2006-10-10  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* ser-mingw.c (free_pipe_state, pipe_wait_handle): Update

gdb/tui/tui-source.c

@@ -194,6 +194,14 @@ tui_set_source_content (struct symtab *s, int line_no, int noerror)
                                            chars until we do  */
 				  while (c != EOF && c != '\n' && c != '\r')
 				    c = fgetc (stream);
+				  /* Handle non-'\n' end-of-line.  */
+				  if (c == '\r' &&
+				     (c = fgetc (stream)) != '\n' && c != EOF)
+				    {
+				       ungetc (c, stream);
+				       c = '\r';
+				    }
+				  
 				}
 			    }
 			  while (c != EOF && c != '\n' && c != '\r' &&