=================================================================== RCS file: /cvs/mandoc/mandocdb.c,v retrieving revision 1.49.2.5 retrieving revision 1.49.2.6 diff -u -p -r1.49.2.5 -r1.49.2.6 --- mandoc/mandocdb.c 2013/09/18 00:54:20 1.49.2.5 +++ mandoc/mandocdb.c 2013/10/01 00:52:58 1.49.2.6 @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.49.2.5 2013/09/18 00:54:20 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.49.2.6 2013/10/01 00:52:58 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011, 2012 Ingo Schwarze @@ -34,7 +34,7 @@ #include #include -#if defined(__linux__) +#if defined(__linux__) || defined(__sun) # include # include #elif defined(__APPLE__) @@ -44,6 +44,10 @@ # include #endif +#if defined(__sun) +#include +#endif + #include "man.h" #include "mdoc.h" #include "mandoc.h" @@ -1756,6 +1760,9 @@ ofile_dirbuild(const char *dir, const char* psec, cons int p_src_form, struct of **of) { char buf[PATH_MAX]; +#if defined(__sun) + struct stat sb; +#endif size_t sz; DIR *d; const char *fn, *sec, *arch; @@ -1778,7 +1785,12 @@ ofile_dirbuild(const char *dir, const char* psec, cons src_form = p_src_form; +#if defined(__sun) + stat(dp->d_name, &sb); + if (S_IFDIR & sb.st_mode) { +#else if (DT_DIR == dp->d_type) { +#endif sec = psec; arch = parch; @@ -1835,7 +1847,11 @@ ofile_dirbuild(const char *dir, const char* psec, cons continue; } +#if defined(__sun) + if (0 == S_IFREG & sb.st_mode) { +#else if (DT_REG != dp->d_type) { +#endif if (warnings) fprintf(stderr, "%s/%s: not a regular file\n",