* lib/getopt.c: Use __progname==__argv[0] when not compiling for cygwin.

* scandir.cc (scandir): Use correct default when compar == NULL.

1 files changed, 9 insertions, 10 deletions

diff --git a/winsup/cygwin/scandir.cc b/winsup/cygwin/scandir.cc
index b2888e23d..52a36eab6 100644
--- a/winsup/cygwin/scandir.cc
+++ b/winsup/cygwin/scandir.cc
@@ -16,8 +16,13 @@
 #include <errno.h>
 #include "cygerrno.h"
 
-extern "C"
-int
+extern "C" int
+alphasort (const struct dirent **a, const struct dirent **b)
+{
+  return strcoll ((*a)->d_name, (*b)->d_name);
+}
+
+extern "C" int
 scandir (const char *dir,
 	 struct dirent ***namelist,
 	 int (*select) (const struct dirent *),
@@ -33,6 +38,8 @@ scandir (const char *dir,
 
   int prior_errno = get_errno ();
   set_errno (0);
+  if (!compar)
+    compar = alphasort;
 
   while ((ent = readdir (dirp)))
     {
@@ -91,11 +98,3 @@ scandir (const char *dir,
     *namelist = nl;
   return count;
 }
-
-extern "C"
-int
-alphasort (const struct dirent **a, const struct dirent **b)
-{
-  return strcoll ((*a)->d_name, (*b)->d_name);
-}
-