Synchronised line endinge with release branch

1 files changed, 155 insertions, 155 deletions

diff --git a/xorg-server/hw/xwin/winclipboardtextconv.c b/xorg-server/hw/xwin/winclipboardtextconv.c
index 487df81ef..400f560fa 100644
--- a/xorg-server/hw/xwin/winclipboardtextconv.c
+++ b/xorg-server/hw/xwin/winclipboardtextconv.c
@@ -1,155 +1,155 @@
-/*

- *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.

- *

- *Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files (the

- *"Software"), to deal in the Software without restriction, including

- *without limitation the rights to use, copy, modify, merge, publish,

- *distribute, sublicense, and/or sell copies of the Software, and to

- *permit persons to whom the Software is furnished to do so, subject to

- *the following conditions:

- *

- *The above copyright notice and this permission notice shall be

- *included in all copies or substantial portions of the Software.

- *

- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of Harold L Hunt II

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from Harold L Hunt II.

- *

- * Authors:	Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-#include <stdio.h>

-#include <stdlib.h>

-

-void

-winClipboardDOStoUNIX (char *pszSrc, int iLength);

-void

-winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength);

-

-/*

- * Convert \r\n to \n

- *

- * NOTE: This was heavily inspired by, Cygwin's

- * winsup/cygwin/fhandler.cc/fhandler_base::read ()

- */

-

-void

-winClipboardDOStoUNIX (char *pszSrc, int iLength)

-{

-  char			*pszDest = pszSrc;

-  char			*pszEnd = pszSrc + iLength;

-

-  /* Loop until the last character */

-  while (pszSrc < pszEnd)

-    {

-      /* Copy the current source character to current destination character */

-      *pszDest = *pszSrc;

-

-      /* Advance to the next source character */

-      pszSrc++;

-

-      /* Don't advance the destination character if we need to drop an \r */

-      if (*pszDest != '\r' || *pszSrc != '\n')

-	pszDest++;

-    }

-

-  /* Move the terminating null */

-  *pszDest = '\0';

-}

-

-

-/*

- * Convert \n to \r\n

- */

-

-void

-winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength)

-{

-  int			iNewlineCount = 0;

-  unsigned char		*pszSrc = *ppszData;

-  unsigned char		*pszEnd = pszSrc + iLength;

-  unsigned char		*pszDest = NULL, *pszDestBegin = NULL;

-

-  winDebug("UNIXtoDOS () - Original data:'%s'\n", *ppszData);

-

-  /* Count \n characters without leading \r */

-  while (pszSrc < pszEnd)

-    {

-      /* Skip ahead two character if found set of \r\n */

-      if (*pszSrc == '\r' && pszSrc + 1 < pszEnd && *(pszSrc + 1) == '\n')

-	{

-	  pszSrc += 2;

-	  continue;

-	} 

-

-      /* Increment the count if found naked \n */

-      if (*pszSrc == '\n')

-	{

-	  iNewlineCount++;

-	}

-

-      pszSrc++;

-    }

-  

-  /* Return if no naked \n's */

-  if (iNewlineCount == 0)

-    return;

-

-  /* Allocate a new string */

-  pszDestBegin = pszDest = malloc (iLength + iNewlineCount + 1);

-

-  /* Set source pointer to beginning of data string */

-  pszSrc = *ppszData;

-

-  /* Loop through all characters in source string */

-  while (pszSrc < pszEnd)

-    {

-      /* Copy line endings that are already valid */

-      if (*pszSrc == '\r' && pszSrc + 1 < pszEnd && *(pszSrc + 1) == '\n')

-	{

-	  *pszDest = *pszSrc;

-	  *(pszDest + 1) = *(pszSrc + 1);

-	  pszDest += 2;

-	  pszSrc += 2;

-	  continue;

-	}

-

-      /* Add \r to naked \n's */

-      if (*pszSrc == '\n')

-	{

-	  *pszDest = '\r';

-	  *(pszDest + 1) = *pszSrc;

-	  pszDest += 2;

-	  pszSrc += 1;

-	  continue;

-	}

-

-      /* Copy normal characters */

-      *pszDest = *pszSrc;

-      pszSrc++;

-      pszDest++;

-    }

-

-  /* Put terminating null at end of new string */

-  *pszDest = '\0';

-

-  /* Swap string pointers */

-  free (*ppszData);

-  *ppszData = pszDestBegin;

-

-  winDebug("UNIXtoDOS () - Final string:'%s'\n", pszDestBegin);

-}

+/*
+ *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
+ *
+ *Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ *"Software"), to deal in the Software without restriction, including
+ *without limitation the rights to use, copy, modify, merge, publish,
+ *distribute, sublicense, and/or sell copies of the Software, and to
+ *permit persons to whom the Software is furnished to do so, subject to
+ *the following conditions:
+ *
+ *The above copyright notice and this permission notice shall be
+ *included in all copies or substantial portions of the Software.
+ *
+ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of Harold L Hunt II
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from Harold L Hunt II.
+ *
+ * Authors:	Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+void
+winClipboardDOStoUNIX (char *pszSrc, int iLength);
+void
+winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength);
+
+/*
+ * Convert \r\n to \n
+ *
+ * NOTE: This was heavily inspired by, Cygwin's
+ * winsup/cygwin/fhandler.cc/fhandler_base::read ()
+ */
+
+void
+winClipboardDOStoUNIX (char *pszSrc, int iLength)
+{
+  char			*pszDest = pszSrc;
+  char			*pszEnd = pszSrc + iLength;
+
+  /* Loop until the last character */
+  while (pszSrc < pszEnd)
+    {
+      /* Copy the current source character to current destination character */
+      *pszDest = *pszSrc;
+
+      /* Advance to the next source character */
+      pszSrc++;
+
+      /* Don't advance the destination character if we need to drop an \r */
+      if (*pszDest != '\r' || *pszSrc != '\n')
+	pszDest++;
+    }
+
+  /* Move the terminating null */
+  *pszDest = '\0';
+}
+
+
+/*
+ * Convert \n to \r\n
+ */
+
+void
+winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength)
+{
+  int			iNewlineCount = 0;
+  unsigned char		*pszSrc = *ppszData;
+  unsigned char		*pszEnd = pszSrc + iLength;
+  unsigned char		*pszDest = NULL, *pszDestBegin = NULL;
+
+  winDebug("UNIXtoDOS () - Original data:'%s'\n", *ppszData);
+
+  /* Count \n characters without leading \r */
+  while (pszSrc < pszEnd)
+    {
+      /* Skip ahead two character if found set of \r\n */
+      if (*pszSrc == '\r' && pszSrc + 1 < pszEnd && *(pszSrc + 1) == '\n')
+	{
+	  pszSrc += 2;
+	  continue;
+	} 
+
+      /* Increment the count if found naked \n */
+      if (*pszSrc == '\n')
+	{
+	  iNewlineCount++;
+	}
+
+      pszSrc++;
+    }
+  
+  /* Return if no naked \n's */
+  if (iNewlineCount == 0)
+    return;
+
+  /* Allocate a new string */
+  pszDestBegin = pszDest = malloc (iLength + iNewlineCount + 1);
+
+  /* Set source pointer to beginning of data string */
+  pszSrc = *ppszData;
+
+  /* Loop through all characters in source string */
+  while (pszSrc < pszEnd)
+    {
+      /* Copy line endings that are already valid */
+      if (*pszSrc == '\r' && pszSrc + 1 < pszEnd && *(pszSrc + 1) == '\n')
+	{
+	  *pszDest = *pszSrc;
+	  *(pszDest + 1) = *(pszSrc + 1);
+	  pszDest += 2;
+	  pszSrc += 2;
+	  continue;
+	}
+
+      /* Add \r to naked \n's */
+      if (*pszSrc == '\n')
+	{
+	  *pszDest = '\r';
+	  *(pszDest + 1) = *pszSrc;
+	  pszDest += 2;
+	  pszSrc += 1;
+	  continue;
+	}
+
+      /* Copy normal characters */
+      *pszDest = *pszSrc;
+      pszSrc++;
+      pszDest++;
+    }
+
+  /* Put terminating null at end of new string */
+  *pszDest = '\0';
+
+  /* Swap string pointers */
+  free (*ppszData);
+  *ppszData = pszDestBegin;
+
+  winDebug("UNIXtoDOS () - Final string:'%s'\n", pszDestBegin);
+}