toolchain/musl: update to 1.2.4

[openwrt/staging/nbd.git] / toolchain / musl / patches / 600-nftw-support-common-gnu-extension.patch

diff --git a/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch b/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch
index 2a7436cf8489b4e376419d1d7064cb2935f0f7a6..7a1ab3f99a36196e525744a469fbbe862c8f1c5f 100644 (file)
--- a/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch
+++ b/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch
@@ -33,7 +33,7 @@ Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
  #include <ftw.h>
  #include <dirent.h>
  #include <fcntl.h>
-@@ -72,8 +73,20 @@ static int do_nftw(char *path, int (*fn)
+@@ -74,8 +75,20 @@ static int do_nftw(char *path, int (*fn)
                if (!fd_limit) close(dfd);
        }
  
@@ -56,7 +56,7 @@ Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
  
        for (; h; h = h->chain)
                if (h->dev == st.st_dev && h->ino == st.st_ino)
-@@ -101,7 +114,10 @@ static int do_nftw(char *path, int (*fn)
+@@ -103,7 +116,10 @@ static int do_nftw(char *path, int (*fn)
                                strcpy(path+j+1, de->d_name);
                                if ((r=do_nftw(path, fn, fd_limit-1, flags, &new))) {
                                        closedir(d);
@@ -68,7 +68,7 @@ Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
                                }
                        }
                        closedir(d);
-@@ -112,8 +128,16 @@ static int do_nftw(char *path, int (*fn)
+@@ -114,8 +130,16 @@ static int do_nftw(char *path, int (*fn)
        }
  
        path[l] = 0;
@@ -87,9 +87,9 @@ Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
  
        return 0;
  }
-@@ -139,4 +163,5 @@ int nftw(const char *path, int (*fn)(con
+@@ -140,3 +164,5 @@ int nftw(const char *path, int (*fn)(con
+       pthread_setcancelstate(cs, 0);
        return r;
  }
- 
++
 +#undef nftw64
- weak_alias(nftw, nftw64);