d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let users(1) use an std::set, instead of std::{vector,sort,unique}.

Browse Source 
Reviewed by:	gahr
This commit is contained in:
Ed Schouten 2014-07-10 15:56:15 +00:00
parent 55ba623622
commit 975f912456
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
usr.bin/users/users.cc
View File

@ -36,14 +36,14 @@ __FBSDID("$FreeBSD$");
#include <iostream>
#include <iterator>
#include <string>
#include <vector>
#include <set>
using namespace std;
int
main(int argc, char **)
{
struct utmpx *ut;
vector<string> names;
set<string> names;
if (argc > 1) {
cerr << "usage: users" << endl;
@ -51,19 +51,16 @@ main(int argc, char **)
}
setutxent();
while ((ut = getutxent()) != NULL) {
if (ut->ut_type != USER_PROCESS)
continue;
names.push_back(ut->ut_user);
}
while ((ut = getutxent()) != NULL)
if (ut->ut_type == USER_PROCESS)
names.insert(ut->ut_user);
endutxent();
if (names.size() == 0) {
if (!names.empty()) {
auto last = names.end();
--last;
copy(names.begin(), last, ostream_iterator<string>(cout, " "));
cout << *last << endl;
}
return (0);
}
sort(begin(names), end(names));
vector<string>::iterator last(unique(begin(names), end(names)));
copy(begin(names), last-1, ostream_iterator<string>(cout, " "));
cout << *(last-1) << endl;
}