file names */
int same_inodes_are_different = 0; /* 1 means that comparison between
- two file with same inode will
+ two files with same inode will
always be false */
-int tty_width = -1; /* Positive value means what width to use to show
- the progress bar */
-
#ifdef WITH_MD5
int use_md5 = 0; /* 1 means we keep an MD5 signature for each file */
#endif
void print_progress(int max, int n, int *pp) {
int p, k;
- int width;
- if(show_progress && tty_width > 0) {
+ int width, tty_width;
+ struct winsize win;
+
+ if(show_progress &&
+ isatty(STDOUT_FILENO) &&
+ !ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
+ tty_width = win.ws_col;
width = tty_width - 7;
p = (width * n) / (max - 1);
if(p > *pp) {
struct file_node *node1, *node2;
int not_in, found;
int nb_groups, nb_nodes;
- int list1_length, previous_progress;
- struct winsize win;
+ int list1_length, list2_length, previous_progress;
char *buffer1 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
char *buffer2 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
not_in = 0;
if(show_progress) {
- if(isatty(STDOUT_FILENO) &&
- !ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
- tty_width = win.ws_col;
- }
fprintf(stderr, "Scanning %s ... ", dirname1);
}
list1 = scan_directory(0, dirname1);
+ list1_length = file_list_length(list1);
+
if(dirname2) {
if(strncmp(dirname2, "not:", 4) == 0) {
not_in = 1;
if(show_progress) {
fprintf(stderr, "done.\n");
+ fprintf(stderr,
+ "%s: %d file%s.\n",
+ dirname1, list1_length, (list1_length > 1 ? "s" : ""));
+ if(dirname2) {
+ list2_length = file_list_length(list2);
+ fprintf(stderr,
+ "%s: %d file%s.\n",
+ dirname2, list2_length, (list2_length > 1 ? "s" : ""));
+ }
+ fprintf(stderr, "Now looking for identical files.\n");
}
nb_groups = 0;
previous_progress = -1;
nb_nodes = 0;
- list1_length = file_list_length(list1);
if(not_in) {
for(node1 = list1; node1; node1 = node1->next) {