size_t size;
ino_t inode;
struct file_with_size *next;
- int group_id;
+ int group_id, dir_id;
};
void file_list_delete(struct file_with_size *head) {
close(fd2);
return 1;
} else {
- if(strncmp(buffer1, buffer2, s1)) {
+ if(memcmp(buffer1, buffer2, s1)) {
close(fd1);
close(fd2);
return 0;
tmp->size = sb.st_size;
tmp->inode = sb.st_ino;
tmp->group_id = -1;
+ tmp->dir_id = -1;
tail = tmp;
}
}
} else if((*f1)->group_id > (*f2)->group_id) {
return 1;
} else {
- return 0;
+ if((*f1)->dir_id < (*f2)->dir_id) {
+ return -1;
+ } else if((*f1)->dir_id > (*f2)->dir_id) {
+ return 1;
+ } else {
+ return 0;
+ }
}
}
if(node1->group_id >= 0) { nb++; }
}
- if(show_hits) {
+ if(list2) {
for(node2 = list2; node2; node2 = node2->next) {
if(node2->group_id >= 0) { nb++; }
}
}
}
- if(show_hits) {
+ if(list2) {
for(node2 = list2; node2; node2 = node2->next) {
if(node2->group_id >= 0) {
nodes[n++] = node2;
qsort(nodes, nb, sizeof(struct file_with_size *), compare_nodes);
for(n = 0; n < nb; n++) {
+ if(!show_groups && n > 0 && nodes[n]->group_id != nodes[n-1]->group_id) {
+ printf("\n");
+ }
print_file(nodes[n]);
}
if(dirname2) {
if(strncmp(dirname2, "not:", 4) == 0) {
not_in = 1;
+ /* We should show groups even in that mode. However they are not
+ properly calculated for now, so we force it off. */
+ show_groups = 0;
dirname2 += 4;
}
if(show_progress) {
node1->group_id = node2->group_id;
} else {
node1->group_id = k;
+ node1->dir_id = 1;
k++;
}
}
if(node2->group_id < 0) {
node2->group_id = node1->group_id;
+ node2->dir_id = 2;
}
}
}
}
}
- print_result(list1, list2);
-
- file_list_delete(list1);
-
if(dirname2) {
+ print_result(list1, list2);
+ file_list_delete(list1);
file_list_delete(list2);
+ } else {
+ print_result(list1, 0);
+ file_list_delete(list1);
}
}
setlocale (LC_ALL, "");
while (1) {
- c = getopt(argc, argv, "hrcgd0p");
+ c = getopt(argc, argv, "hircgd0p");
if (c == -1)
break;