You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by jc...@apache.org on 2012/07/07 00:46:15 UTC
svn commit: r1358465 - /subversion/trunk/subversion/svn/file-merge.c
Author: jcorvel
Date: Fri Jul 6 22:46:15 2012
New Revision: 1358465
URL: http://svn.apache.org/viewvc?rev=1358465&view=rev
Log:
* subversion/svn/file-merge.c
(get_term_width): Get console width on Windows using
GetConsoleScreenBufferInfo. This seems to work for cmd.exe as well as for
cygwin.
Modified:
subversion/trunk/subversion/svn/file-merge.c
Modified: subversion/trunk/subversion/svn/file-merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1358465&r1=1358464&r2=1358465&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Fri Jul 6 22:46:15 2012
@@ -317,7 +317,17 @@ get_term_width(void)
return ws.ws_col;
}
}
+#elif defined WIN32
+ CONSOLE_SCREEN_BUFFER_INFO csbi;
+
+ if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi))
+ {
+ if (csbi.dwSize.X < 80)
+ return 80;
+ return csbi.dwSize.X;
+ }
#endif
+
columns_env = getenv("COLUMNS");
if (columns_env)
{