emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* lib/commonio.c: Stop sorting entries when we reach the first

Browse Source 
NIS line.
This commit is contained in:
nekral-guest 2010-03-18 23:21:21 +00:00
parent be3a05eab2
commit e19c7200eb
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-03-19 Nicolas François <nicolas.francois@centraliens.net>
* lib/commonio.c: Stop sorting entries when we reach the first
NIS line.
2010-03-18 Nicolas François <nicolas.francois@centraliens.net> 2010-03-18 Nicolas François <nicolas.francois@centraliens.net>
* src/chsh.c: Even for root, warn if an invalid shell is * src/chsh.c: Even for root, warn if an invalid shell is

35
lib/commonio.c
View File

@ -706,10 +706,24 @@ commonio_sort (struct commonio_db *db, int (*cmp) (const void *, const void *))
{ {
struct commonio_entry **entries, *ptr; struct commonio_entry **entries, *ptr;
size_t n = 0, i; size_t n = 0, i;
#if KEEP_NIS_AT_END
struct commonio_entry *nis = NULL
#endif
for (ptr = db->head; NULL != ptr; ptr = ptr->next) { for (ptr = db->head;
(NULL != ptr)
#if KEEP_NIS_AT_END
&& ('+' != ptr->line[0])
#endif
;
ptr = ptr->next) {
n++; n++;
} }
#if KEEP_NIS_AT_END
if (NULL != ptr) {
nis = ptr;
}
#endif
if (n <= 1) { if (n <= 1) {
return 0; return 0;
@ -721,7 +735,13 @@ commonio_sort (struct commonio_db *db, int (*cmp) (const void *, const void *))
} }
n = 0; n = 0;
for (ptr = db->head; NULL != ptr; ptr = ptr->next) { for (ptr = db->head;
#if KEEP_NIS_AT_END
nis != ptr;
#else
NULL != ptr;
#endif
ptr = ptr->next) {
entries[n++] = ptr; entries[n++] = ptr;
} }
qsort (entries, n, sizeof (struct commonio_entry *), cmp); qsort (entries, n, sizeof (struct commonio_entry *), cmp);
@ -729,11 +749,16 @@ commonio_sort (struct commonio_db *db, int (*cmp) (const void *, const void *))
/* Take care of the head and tail separately */ /* Take care of the head and tail separately */
db->head = entries[0]; db->head = entries[0];
n--; n--;
db->tail = entries[n]; #if KEEP_NIS_AT_END
if (NULL == nis)
#endif
{
db->tail = entries[n];
}
db->head->prev = NULL; db->head->prev = NULL;
db->head->next = entries[1]; db->head->next = entries[1];
db->tail->prev = entries[n - 1]; entries[n]->prev = entries[n - 1];
db->tail->next = NULL; entries[n]->next = NULL;
/* Now other elements have prev and next entries */ /* Now other elements have prev and next entries */
for (i = 1; i < n; i++) { for (i = 1; i < n; i++) {