From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from scc-mailout-kit-01-web.scc.kit.edu (scc-mailout-kit-01-web.scc.kit.edu [129.13.231.93]); by fantadrom.bsd.lv (OpenSMTPD) with ESMTP id aa6924c0; for ; Thu, 11 Dec 2014 12:56:39 -0500 (EST) Received: from asta-nat.asta.uni-karlsruhe.de ([172.22.63.82] helo=hekate.usta.de) by scc-mailout-kit-01.scc.kit.edu with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (envelope-from ) id 1Xz7yf-0004gt-72; Thu, 11 Dec 2014 18:56:38 +0100 Received: from donnerwolke.usta.de ([172.24.96.3]) by hekate.usta.de with esmtp (Exim 4.77) (envelope-from ) id 1Xz7yf-0002LP-0P; Thu, 11 Dec 2014 18:56:37 +0100 Received: from iris.usta.de ([172.24.96.5] helo=usta.de) by donnerwolke.usta.de with esmtp (Exim 4.72) (envelope-from ) id 1Xz7ye-0001Yn-VO; Thu, 11 Dec 2014 18:56:36 +0100 Received: from schwarze by usta.de with local (Exim 4.77) (envelope-from ) id 1Xz7ye-0005M7-L3; Thu, 11 Dec 2014 18:56:36 +0100 Date: Thu, 11 Dec 2014 18:56:36 +0100 From: Ingo Schwarze To: Thomas Klausner Cc: tech@mdocml.bsd.lv Subject: Re: call for testing: mandoc-1.13.2 release candidate Message-ID: <20141211175636.GH6788@iris.usta.de> References: <20141211124155.GA6788@iris.usta.de> <20141211172204.GR14503@danbala.tuwien.ac.at> X-Mailinglist: mdocml-tech Reply-To: tech@mdocml.bsd.lv MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20141211172204.GR14503@danbala.tuwien.ac.at> User-Agent: Mutt/1.5.21 (2010-09-15) Hi Thomas, Thomas Klausner wrote on Thu, Dec 11, 2014 at 06:22:04PM +0100: > On Smart OS (Illumos): > > cc -g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings -c -o compat_fts.o compat_fts.c > compat_fts.c: In function 'fts_open': > compat_fts.c:96:2: warning: implicit declaration of function 'MAX' [-Wimplicit-function-declaration] > compat_fts.c: In function 'fts_build': > compat_fts.c:410:47: warning: variable 'nostat' set but not used [-Wunused-but-set-variable] > compat_fts.c: In function 'fts_safe_changedir': > compat_fts.c:807:45: error: 'O_DIRECTORY' undeclared (first use in this function) > compat_fts.c:807:45: note: each undeclared identifier is reported only once for each function it appears in This should fix these problems; does it? Thanks, Ingo Index: compat_fts.c =================================================================== RCS file: /home/cvs/mdocml/mdocml/compat_fts.c,v retrieving revision 1.5 diff -u -p -r1.5 compat_fts.c --- compat_fts.c 11 Dec 2014 09:05:01 -0000 1.5 +++ compat_fts.c 11 Dec 2014 17:53:43 -0000 @@ -62,6 +62,10 @@ static unsigned short fts_stat(FTS *, F static int fts_safe_changedir(FTS *, FTSENT *, int, const char *); #define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2]))) +#define MAX(a,b) (((a)>(b))?(a):(b)) +#ifndef O_DIRECTORY +#define O_DIRECTORY 0 +#endif #define CLR(opt) (sp->fts_options &= ~(opt)) #define ISSET(opt) (sp->fts_options & (opt)) @@ -407,7 +411,7 @@ fts_build(FTS *sp) DIR *dirp; void *oldaddr; size_t dlen, len, maxlen; - int nitems, cderrno, descend, level, nlinks, nostat, doadjust; + int nitems, cderrno, descend, level, doadjust; int saved_errno; char *cp; @@ -425,14 +429,6 @@ fts_build(FTS *sp) } /* - * Nlinks is the number of possible entries of type directory in the - * directory if we're cheating on stat calls, 0 if we're not doing - * any stat calls at all, -1 if we're doing stats on everything. - */ - nlinks = -1; - nostat = 0; - - /* * If we're going to need to stat anything or we want to descend * and stay in the directory, chdir. If this fails we keep going, * but set a flag so we don't chdir after the post-order visit. @@ -449,8 +445,7 @@ fts_build(FTS *sp) */ cderrno = 0; if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) { - if (nlinks) - cur->fts_errno = errno; + cur->fts_errno = errno; cur->fts_flags |= FTS_DONTCHDIR; descend = 0; cderrno = errno; @@ -545,21 +540,9 @@ mem1: saved_errno = errno; } if (cderrno) { - if (nlinks) { - p->fts_info = FTS_NS; - p->fts_errno = cderrno; - } else - p->fts_info = FTS_NSOK; + p->fts_info = FTS_NS; + p->fts_errno = cderrno; p->fts_accpath = cur->fts_accpath; - } else if (nlinks == 0 -#ifdef DT_DIR - || (nostat && - dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN) -#endif - ) { - p->fts_accpath = - ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name; - p->fts_info = FTS_NSOK; } else { /* Build a file name for fts_stat to stat. */ if (ISSET(FTS_NOCHDIR)) { @@ -569,11 +552,6 @@ mem1: saved_errno = errno; p->fts_accpath = p->fts_name; /* Stat it. */ p->fts_info = fts_stat(sp, p); - - /* Decrement link count if applicable. */ - if (nlinks > 0 && (p->fts_info == FTS_D || - p->fts_info == FTS_DC || p->fts_info == FTS_DOT)) - --nlinks; } /* We walk in directory order so "ls -f" doesn't get upset. */ -- To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv