Ticket #12291: 12291.patch

src/system/libroot/posix/fts.c

@@ -80 +80 @@
 static int   fts_safe_changedir(FTS *, FTSENT *, int, char *);
 static int   fts_ufslinks(FTS *, const FTSENT *);
 
+
+FTS * __fts_open(char * const *argv, int options, int (*compar)(
+        const FTSENT * const *, const FTSENT * const *));
+int __fts_close(FTS *sp);
+FTSENT * __fts_read(FTS *sp);
+int __fts_set(FTS *sp, FTSENT *p, int instr);
+FTSENT * __fts_children(FTS *sp, int instr);
+void *(__fts_get_clientptr)(FTS *sp);
+FTS * (__fts_get_stream)(FTSENT *p);
+void __fts_set_clientptr(FTS *sp, void *clientptr);
+
+
+#undef weak_alias
+#define weak_alias(name, aliasname) \
+    extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
+
 #define ISDOT(a)    (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
 
 #define CLR(opt)    (sp->fts_options &= ~(opt))
@@ -128 +144 @@
 #endif /* !__HAIKU__ */
 
 FTS *
-fts_open(argv, options, compar)
+__fts_open(argv, options, compar)
     char * const *argv;
     int options;
     int (*compar)(const FTSENT * const *, const FTSENT * const *);
@@ -245 +261 @@
     return (NULL);
 }
 
+
+weak_alias (__fts_open, fts_open)
+
+
 static void
 fts_load(FTS *sp, FTSENT *p)
 {
@@ -270 +290 @@
 }
 
 int
-fts_close(FTS *sp)
+__fts_close(FTS *sp)
 {
     FTSENT *freep, *p;
     int saved_errno;
@@ -315 +335 @@
     return (0);
 }
 
+
+weak_alias (__fts_close, fts_close)
+
+
 /*
  * Special case of "/" at the end of the path so that slashes aren't
  * appended which would cause paths to be written as "....//foo".
@@ -324 +348 @@
         ? p->fts_pathlen - 1 : p->fts_pathlen)
 
 FTSENT *
-fts_read(FTS *sp)
+__fts_read(FTS *sp)
 {
     FTSENT *p, *tmp;
     int instr;
@@ -510 +534 @@
     return (sp->fts_cur = p);
 }
 
+
+weak_alias (__fts_read, fts_read)
+
+
 /*
  * Fts_set takes the stream as an argument although it's not used in this
  * implementation; it would be necessary if anyone wanted to add global
@@ -518 +546 @@
  */
 /* ARGSUSED */
 int
-fts_set(FTS *sp, FTSENT *p, int instr)
+__fts_set(FTS *sp, FTSENT *p, int instr)
 {
     if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
         instr != FTS_NOINSTR && instr != FTS_SKIP) {
@@ -529 +557 @@
     return (0);
 }
 
+
+weak_alias (__fts_set, fts_set)
+
+
 FTSENT *
-fts_children(FTS *sp, int instr)
+__fts_children(FTS *sp, int instr)
 {
     FTSENT *p;
     int fd;
@@ -597 +629 @@
     return (sp->fts_child);
 }
 
+
+weak_alias (__fts_children, fts_children)
+
+
 #ifndef fts_get_clientptr
 #error "fts_get_clientptr not defined"
 #endif
 
 void *
-(fts_get_clientptr)(FTS *sp)
+(__fts_get_clientptr)(FTS *sp)
 {
 
     return (fts_get_clientptr(sp));
 }
 
+
+weak_alias (__fts_get_clientptr, fts_get_clientptr)
+
+
 #ifndef fts_get_stream
 #error "fts_get_stream not defined"
 #endif
 
 FTS *
-(fts_get_stream)(FTSENT *p)
+(__fts_get_stream)(FTSENT *p)
 {
     return (fts_get_stream(p));
 }
 
+
+weak_alias (__fts_get_stream, fts_get_stream)
+
+
 void
-fts_set_clientptr(FTS *sp, void *clientptr)
+__fts_set_clientptr(FTS *sp, void *clientptr)
 {
 
     sp->fts_clientptr = clientptr;
 }
 
+
+weak_alias (__fts_set_clientptr, fts_set_clientptr)
+
+
 /*
  * This is the tricky part -- do not casually change *anything* in here.  The
  * idea is to build the linked list of entries that are used by fts_children