mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-29 16:44:03 +00:00
Code Issues Releases Activity

When listing the installed packages, do it in alphabetical order.

Browse Source
This commit is contained in:
John Polstra 1999-07-30 23:14:15 +00:00
parent 8c47947a95
commit 8d14a4acbe
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=49300
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
usr.sbin/pkg_install/info/perform.c
View File

@ -1,6 +1,6 @@
#ifndef lint
static const char rcsid[] =
"$Id: perform.c,v 1.25 1998/09/11 07:26:58 jkh Exp $";
"$Id: perform.c,v 1.26 1998/12/16 13:59:31 jkh Exp $";
#endif
/*
@ -26,8 +26,10 @@ static const char rcsid[] =
#include "lib.h"
#include "info.h"
#include <fts.h>
#include <signal.h>
static int fname_cmp(const FTSENT **, const FTSENT **);
static int pkg_do(char *);
int
@ -49,17 +51,24 @@ pkg_perform(char **pkgs)
return abs(access(buf, R_OK));
}
else if (AllInstalled) {
DIR *dirp;
struct dirent *dp;
FTS *ftsp;
FTSENT *f;
char *paths[2];
if (!isdir(tmp))
return 1;
dirp = opendir(tmp);
if (dirp) {
for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp))
if (strcmp(dp->d_name, ".") && strcmp(dp->d_name, ".."))
err_cnt += pkg_do(dp->d_name);
(void)closedir(dirp);
paths[0] = tmp;
paths[1] = NULL;
ftsp = fts_open(paths, FTS_LOGICAL | FTS_NOCHDIR | FTS_NOSTAT,
fname_cmp);
if (ftsp != NULL) {
while ((f = fts_read(ftsp)) != NULL) {
if (f->fts_info == FTS_D && f->fts_level == 1) {
err_cnt += pkg_do(f->fts_name);
fts_set(ftsp, f, FTS_SKIP);
}
}
fts_close(ftsp);
}
}
else
@ -214,3 +223,9 @@ cleanup(int sig)
if (sig)
exit(1);
}
static int
fname_cmp(const FTSENT **a, const FTSENT **b)
{
return strcmp((*a)->fts_name, (*b)->fts_name);
}