Modernize scandir(3) and alphasort(3) interfaces according to the IEEE

Std 1003.1-2008. Both Linux and Solaris conforms to the new definitions,
so we better follow too (older glibc used old BSDish alphasort prototype
and corresponding type of the comparision function for scandir). While
there, change the definitions of the functions to ANSI C and fix several
style issues nearby.

Remove requirement for "sys/types.h" include for functions from manpage.

POSIX also requires that alphasort(3) sorts as if strcoll(3) was used,
but leave the strcmp(3) call in the function for now.

Adapt in-tree callers of scandir(3) to new declaration. The fact that
select_sections() from catman(1) could modify supplied struct dirent is
a bug.

PR:	standards/142255
MFC after:	2 weeks
This commit is contained in:
Konstantin Belousov 2010-01-04 15:40:17 +00:00
parent ed12757873
commit 4176dd5267
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=201512
8 changed files with 30 additions and 26 deletions

View File

@ -95,7 +95,7 @@ typedef void * DIR;
__BEGIN_DECLS __BEGIN_DECLS
#if __BSD_VISIBLE #if __BSD_VISIBLE
DIR *__opendir2(const char *, int); DIR *__opendir2(const char *, int);
int alphasort(const void *, const void *); int alphasort(const struct dirent **, const struct dirent **);
int getdents(int, char *, int); int getdents(int, char *, int);
int getdirentries(int, char *, int, long *); int getdirentries(int, char *, int, long *);
#endif #endif
@ -109,7 +109,8 @@ int readdir_r(DIR *, struct dirent *, struct dirent **);
void rewinddir(DIR *); void rewinddir(DIR *);
#if __BSD_VISIBLE #if __BSD_VISIBLE
int scandir(const char *, struct dirent ***, int scandir(const char *, struct dirent ***,
int (*)(struct dirent *), int (*)(const void *, const void *)); int (*)(const struct dirent *), int (*)(const struct dirent **,
const struct dirent **));
#endif #endif
#if __XSI_VISIBLE #if __XSI_VISIBLE
void seekdir(DIR *, long); void seekdir(DIR *, long);

View File

@ -240,7 +240,8 @@ __opendir_common(int fd, const char *name, int flags)
/* /*
* This sort must be stable. * This sort must be stable.
*/ */
mergesort(dpv, n, sizeof(*dpv), alphasort); mergesort(dpv, n, sizeof(*dpv), (int (*)(const
void *, const void *))alphasort);
dpv[n] = NULL; dpv[n] = NULL;
xp = NULL; xp = NULL;

View File

@ -28,7 +28,7 @@
.\" @(#)scandir.3 8.1 (Berkeley) 6/4/93 .\" @(#)scandir.3 8.1 (Berkeley) 6/4/93
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd June 4, 1993 .Dd January 3, 2010
.Dt SCANDIR 3 .Dt SCANDIR 3
.Os .Os
.Sh NAME .Sh NAME
@ -38,12 +38,11 @@
.Sh LIBRARY .Sh LIBRARY
.Lb libc .Lb libc
.Sh SYNOPSIS .Sh SYNOPSIS
.In sys/types.h
.In dirent.h .In dirent.h
.Ft int .Ft int
.Fn scandir "const char *dirname" "struct dirent ***namelist" "int \\*(lp*select\\*(rp\\*(lpstruct dirent *\\*(rp" "int \\*(lp*compar\\*(rp\\*(lpconst void *, const void *\\*(rp" .Fn scandir "const char *dirname" "struct dirent ***namelist" "int \\*(lp*select\\*(rp\\*(lpconst struct dirent *\\*(rp" "int \\*(lp*compar\\*(rp\\*(lpconst struct dirent **, const struct dirent **\\*(rp"
.Ft int .Ft int
.Fn alphasort "const void *d1" "const void *d2" .Fn alphasort "const struct dirent **d1" "const struct dirent **d2"
.Sh DESCRIPTION .Sh DESCRIPTION
The The
.Fn scandir .Fn scandir

View File

@ -58,11 +58,9 @@ __FBSDID("$FreeBSD$");
(((dp)->d_namlen + 1 + 3) &~ 3)) (((dp)->d_namlen + 1 + 3) &~ 3))
int int
scandir(dirname, namelist, select, dcomp) scandir(const char *dirname, struct dirent ***namelist,
const char *dirname; int (*select)(const struct dirent *), int (*dcomp)(const struct dirent **,
struct dirent ***namelist; const struct dirent **))
int (*select)(struct dirent *);
int (*dcomp)(const void *, const void *);
{ {
struct dirent *d, *p, **names = NULL; struct dirent *d, *p, **names = NULL;
size_t nitems = 0; size_t nitems = 0;
@ -111,26 +109,25 @@ scandir(dirname, namelist, select, dcomp)
} }
closedir(dirp); closedir(dirp);
if (nitems && dcomp != NULL) if (nitems && dcomp != NULL)
qsort(names, nitems, sizeof(struct dirent *), dcomp); qsort(names, nitems, sizeof(struct dirent *),
(int (*)(const void *, const void *))dcomp);
*namelist = names; *namelist = names;
return(nitems); return (nitems);
fail: fail:
while (nitems > 0) while (nitems > 0)
free(names[--nitems]); free(names[--nitems]);
free(names); free(names);
closedir(dirp); closedir(dirp);
return -1; return (-1);
} }
/* /*
* Alphabetic order comparison routine for those who want it. * Alphabetic order comparison routine for those who want it.
*/ */
int int
alphasort(d1, d2) alphasort(const struct dirent **d1, const struct dirent **d2)
const void *d1;
const void *d2;
{ {
return(strcmp((*(struct dirent **)d1)->d_name,
(*(struct dirent **)d2)->d_name)); return (strcmp((*d1)->d_name, (*d2)->d_name));
} }

View File

@ -589,9 +589,15 @@ process_section(char *mandir, char *section)
} }
static int static int
select_sections(struct dirent *entry) select_sections(const struct dirent *entry)
{ {
return directory_type(entry->d_name) == MAN_SECTION_DIR; char *name;
int ret;
name = strdup(entry->d_name);
ret = directory_type(name) == MAN_SECTION_DIR;
free(name);
return (ret);
} }
/* /*

View File

@ -879,9 +879,9 @@ process_section(char *section_dir)
* Returns whether the directory entry is a man page section. * Returns whether the directory entry is a man page section.
*/ */
static int static int
select_sections(struct dirent *entry) select_sections(const struct dirent *entry)
{ {
char *p = &entry->d_name[3]; const char *p = &entry->d_name[3];
if (strncmp(entry->d_name, "man", 3) != 0) if (strncmp(entry->d_name, "man", 3) != 0)
return 0; return 0;

View File

@ -280,7 +280,7 @@ void inform(const struct printer *_pp, char *_cf);
void init_printer(struct printer *_pp); void init_printer(struct printer *_pp);
void init_request(struct request *_rp); void init_request(struct request *_rp);
int inlist(char *_uname, char *_cfile); int inlist(char *_uname, char *_cfile);
int iscf(struct dirent *_d); int iscf(const struct dirent *_d);
void ldump(const char *_nfile, const char *_datafile, int _copies); void ldump(const char *_nfile, const char *_datafile, int _copies);
void lastprinter(void); void lastprinter(void);
int lockchk(struct printer *_pp, char *_slockf); int lockchk(struct printer *_pp, char *_slockf);

View File

@ -384,7 +384,7 @@ rmremote(const struct printer *pp)
* Return 1 if the filename begins with 'cf' * Return 1 if the filename begins with 'cf'
*/ */
int int
iscf(struct dirent *d) iscf(const struct dirent *d)
{ {
return(d->d_name[0] == 'c' && d->d_name[1] == 'f'); return(d->d_name[0] == 'c' && d->d_name[1] == 'f');
} }