From cc3ce0bb5f8eeb631ea583400cbc6e286167c589 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Thu, 12 Jun 2003 20:40:58 +0000
Subject: [PATCH] Throughout, always return error when GetShortPathName returns
 0.

---
 winsup/utils/ChangeLog  | 4 ++++
 winsup/utils/cygpath.cc | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index c1be6532d..a390b624c 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-12  Christopher Faylor  <cgf@redhat.com>
+
+	Throughout, always return error when GetShortPathName returns 0.
+
 2003-04-26  Joshua Daniel Franklin <joshuadfranklin at yahoo dot com>
 
 	* mkpasswd.c (usage) Remove extra newline from description output.
diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index 74f3f660b..9d9c1903f 100644
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -121,7 +121,7 @@ get_short_paths (char *path)
       if (ptr)
 	*ptr++ = 0;
       len = GetShortPathName (next, NULL, 0);
-      if (len == 0 && GetLastError () == ERROR_INVALID_PARAMETER)
+      if (!len)
 	{
 	  fprintf (stderr, "%s: cannot create short name of %s\n", prog_name,
 		   next);
@@ -139,7 +139,7 @@ get_short_paths (char *path)
   for (;;)
     {
       len = GetShortPathName (ptr, sptr, acc);
-      if (len == 0 && GetLastError () == ERROR_INVALID_PARAMETER)
+      if (!len)
 	{
 	  fprintf (stderr, "%s: cannot create short name of %s\n", prog_name,
 		   ptr);
@@ -162,7 +162,7 @@ get_short_name (const char *filename)
 {
   char *sbuf, buf[MAX_PATH];
   DWORD len = GetShortPathName (filename, buf, MAX_PATH);
-  if (len == 0 && GetLastError () == ERROR_INVALID_PARAMETER)
+  if (!len)
     {
       fprintf (stderr, "%s: cannot create short name of %s\n", prog_name,
 	       filename);