[tlbuild] Patch to kpathsea/config.h for cygwin 1.7

Karl Berry karl at freefriends.org
Sat Dec 13 18:18:57 CET 2008


Hi Ken,

    Following some discussion on the cygwin list 
    (http://cygwin.com/ml/cygwin/2008-12/msg00290.html), I would like to 
    withdraw the patch I submitted yesterday and instead propose the one 
    attached here.  It makes a generic change for all "unix-like" systems, 
    with no need to make cygwin a special case.

Makes sense, thanks.  Given this, I don't think there's a need to #ifdef
AMIGA any more.  So I made the following change:

--- elt-dirs.c  (revision 11604)
+++ elt-dirs.c  (working copy)
@@ -280,14 +280,13 @@
                  some such, we can still find subdirectories, even if it
                  is much slower.  */
 #ifdef ST_NLINK_TRICK
-#ifdef AMIGA
-              /* With SAS/C++ 6.55 on the Amiga, stat' sets the st_nlink'
-                 field to -1 for a file, or to 1 for a directory.  */
-              if (links == 1)
-#else
-              if (links > 2)
-#endif /* not AMIGA */
-#endif /* not ST_NLINK_TRICK */
+              /* With SAS/C++ 6.55 on the Amiga, stat sets the st_nlink
+                 field to -1 for a file, or to 1 for a directory.
+                 Cygwin 1.7 also leaves st_nlink as 1:
+                 http://cygwin.com/ml/cygwin-developers/2008-04/msg00110.html
+                 */
+              if (links != 2)
+#endif /* ST_NLINK_TRICK */
                 /* All criteria are met; find subdirectories.  */
                 do_subdir (str_list_ptr, FN_STRING (name),
                            potential_len, post);

I also fixed the manual.

Thanks,
Karl


More information about the tlbuild mailing list