--- afd-1.3.3/src/amg/check_files.c.old 2006-06-10 13:23:49.000000000 +0200 +++ afd-1.3.3/src/amg/check_files.c 2006-08-22 10:53:40.000000000 +0200 @@ -298,16 +298,16 @@ if (((fra[p_de->fra_pos].ignore_size == 0) || ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_EQUAL) && (fra[p_de->fra_pos].ignore_size == stat_buf.st_size)) || - ((fra[p_de->fra_pos].gt_lt_sign == ISIZE_LESS_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_LESS_THEN) && (fra[p_de->fra_pos].ignore_size < stat_buf.st_size)) || - ((fra[p_de->fra_pos].gt_lt_sign == ISIZE_GREATER_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_GREATER_THEN) && (fra[p_de->fra_pos].ignore_size > stat_buf.st_size))) && ((fra[p_de->fra_pos].ignore_file_time == 0) || ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_EQUAL) && (fra[p_de->fra_pos].ignore_file_time == diff_time)) || - ((fra[p_de->fra_pos].gt_lt_sign == IFTIME_LESS_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_LESS_THEN) && (fra[p_de->fra_pos].ignore_file_time < diff_time)) || - ((fra[p_de->fra_pos].gt_lt_sign == IFTIME_GREATER_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_GREATER_THEN) && (fra[p_de->fra_pos].ignore_file_time > diff_time)))) { #ifdef _POSIX_SAVED_IDS @@ -398,16 +398,16 @@ if (((fra[p_de->fra_pos].ignore_size == 0) || ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_EQUAL) && (fra[p_de->fra_pos].ignore_size == stat_buf.st_size)) || - ((fra[p_de->fra_pos].gt_lt_sign == ISIZE_LESS_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_LESS_THEN) && (fra[p_de->fra_pos].ignore_size < stat_buf.st_size)) || - ((fra[p_de->fra_pos].gt_lt_sign == ISIZE_GREATER_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_GREATER_THEN) && (fra[p_de->fra_pos].ignore_size > stat_buf.st_size))) && ((fra[p_de->fra_pos].ignore_file_time == 0) || ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_EQUAL) && (fra[p_de->fra_pos].ignore_file_time == diff_time)) || - ((fra[p_de->fra_pos].gt_lt_sign == IFTIME_LESS_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_LESS_THEN) && (fra[p_de->fra_pos].ignore_file_time < diff_time)) || - ((fra[p_de->fra_pos].gt_lt_sign == IFTIME_GREATER_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_GREATER_THEN) && (fra[p_de->fra_pos].ignore_file_time > diff_time)))) { #ifdef _POSIX_SAVED_IDS @@ -565,16 +565,16 @@ (((fra[p_de->fra_pos].ignore_size == 0) || ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_EQUAL) && (fra[p_de->fra_pos].ignore_size == stat_buf.st_size)) || - ((fra[p_de->fra_pos].gt_lt_sign == ISIZE_LESS_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_LESS_THEN) && (fra[p_de->fra_pos].ignore_size < stat_buf.st_size)) || - ((fra[p_de->fra_pos].gt_lt_sign == ISIZE_GREATER_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_GREATER_THEN) && (fra[p_de->fra_pos].ignore_size > stat_buf.st_size))) && ((fra[p_de->fra_pos].ignore_file_time == 0) || ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_EQUAL) && (fra[p_de->fra_pos].ignore_file_time == diff_time)) || - ((fra[p_de->fra_pos].gt_lt_sign == IFTIME_LESS_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_LESS_THEN) && (fra[p_de->fra_pos].ignore_file_time < diff_time)) || - ((fra[p_de->fra_pos].gt_lt_sign == IFTIME_GREATER_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_GREATER_THEN) && (fra[p_de->fra_pos].ignore_file_time > diff_time))))) { #ifdef _POSIX_SAVED_IDS @@ -925,16 +925,16 @@ (((fra[p_de->fra_pos].ignore_size == 0) || ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_EQUAL) && (fra[p_de->fra_pos].ignore_size == stat_buf.st_size)) || - ((fra[p_de->fra_pos].gt_lt_sign == ISIZE_LESS_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_LESS_THEN) && (fra[p_de->fra_pos].ignore_size < stat_buf.st_size)) || - ((fra[p_de->fra_pos].gt_lt_sign == ISIZE_GREATER_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & ISIZE_GREATER_THEN) && (fra[p_de->fra_pos].ignore_size > stat_buf.st_size))) && ((fra[p_de->fra_pos].ignore_file_time == 0) || - ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_EQUAL) && - (fra[p_de->fra_pos].ignore_file_time == diff_time)) || - ((fra[p_de->fra_pos].gt_lt_sign == IFTIME_LESS_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_EQUAL) && + (fra[p_de->fra_pos].ignore_file_time == diff_time)) || + ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_LESS_THEN) && (fra[p_de->fra_pos].ignore_file_time < diff_time)) || - ((fra[p_de->fra_pos].gt_lt_sign == IFTIME_GREATER_THEN) && + ((fra[p_de->fra_pos].gt_lt_sign & IFTIME_GREATER_THEN) && (fra[p_de->fra_pos].ignore_file_time > diff_time))))) { #ifdef _POSIX_SAVED_IDS --- afd-1.3.3/src/fd/get_remote_file_names_ftp.c.old 2006-06-30 10:26:58.000000000 +0200 +++ afd-1.3.3/src/fd/get_remote_file_names_ftp.c 2006-08-22 10:55:50.000000000 +0200 @@ -946,11 +946,11 @@ { if ((rl[i].size > 0) && ((fra[db.fra_pos].ignore_size == 0) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_EQUAL) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_EQUAL) && (fra[db.fra_pos].ignore_size == rl[i].size)) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_LESS_THEN) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_LESS_THEN) && (fra[db.fra_pos].ignore_size < rl[i].size)) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_GREATER_THEN) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_GREATER_THEN) && (fra[db.fra_pos].ignore_size > rl[i].size)))) { if ((rl[i].got_date == NO) || @@ -963,11 +963,11 @@ time_t diff_time; diff_time = current_time - rl[i].file_mtime; - if (((fra[db.fra_pos].gt_lt_sign == IFTIME_EQUAL) && + if (((fra[db.fra_pos].gt_lt_sign & IFTIME_EQUAL) && (fra[db.fra_pos].ignore_file_time == diff_time)) || - ((fra[db.fra_pos].gt_lt_sign == IFTIME_LESS_THEN) && + ((fra[db.fra_pos].gt_lt_sign & IFTIME_LESS_THEN) && (fra[db.fra_pos].ignore_file_time < diff_time)) || - ((fra[db.fra_pos].gt_lt_sign == IFTIME_GREATER_THEN) && + ((fra[db.fra_pos].gt_lt_sign & IFTIME_GREATER_THEN) && (fra[db.fra_pos].ignore_file_time > diff_time))) { *file_size_to_retrieve += rl[i].size; @@ -1106,11 +1106,11 @@ } if ((fra[db.fra_pos].ignore_size == 0) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_EQUAL) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_EQUAL) && (fra[db.fra_pos].ignore_size == rl[*no_of_listed_files].size)) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_LESS_THEN) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_LESS_THEN) && (fra[db.fra_pos].ignore_size < rl[*no_of_listed_files].size)) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_GREATER_THEN) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_GREATER_THEN) && (fra[db.fra_pos].ignore_size > rl[*no_of_listed_files].size))) { if ((rl[*no_of_listed_files].got_date == NO) || @@ -1123,11 +1123,11 @@ time_t diff_time; diff_time = current_time - rl[*no_of_listed_files].file_mtime; - if (((fra[db.fra_pos].gt_lt_sign == IFTIME_EQUAL) && + if (((fra[db.fra_pos].gt_lt_sign & IFTIME_EQUAL) && (fra[db.fra_pos].ignore_file_time == diff_time)) || - ((fra[db.fra_pos].gt_lt_sign == IFTIME_LESS_THEN) && + ((fra[db.fra_pos].gt_lt_sign & IFTIME_LESS_THEN) && (fra[db.fra_pos].ignore_file_time < diff_time)) || - ((fra[db.fra_pos].gt_lt_sign == IFTIME_GREATER_THEN) && + ((fra[db.fra_pos].gt_lt_sign & IFTIME_GREATER_THEN) && (fra[db.fra_pos].ignore_file_time > diff_time))) { (*no_of_listed_files)++; --- afd-1.3.3/src/fd/get_remote_file_names_sftp.c.old 2006-06-30 10:27:02.000000000 +0200 +++ afd-1.3.3/src/fd/get_remote_file_names_sftp.c 2006-08-22 10:56:23.000000000 +0200 @@ -810,11 +810,11 @@ { if ((rl[i].size > 0) && ((fra[db.fra_pos].ignore_size == 0) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_EQUAL) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_EQUAL) && (fra[db.fra_pos].ignore_size == rl[i].size)) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_LESS_THEN) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_LESS_THEN) && (fra[db.fra_pos].ignore_size < rl[i].size)) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_GREATER_THEN) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_GREATER_THEN) && (fra[db.fra_pos].ignore_size > rl[i].size)))) { if ((rl[i].got_date == NO) || @@ -827,11 +827,11 @@ time_t diff_time; diff_time = current_time - rl[i].file_mtime; - if (((fra[db.fra_pos].gt_lt_sign == IFTIME_EQUAL) && + if (((fra[db.fra_pos].gt_lt_sign & IFTIME_EQUAL) && (fra[db.fra_pos].ignore_file_time == diff_time)) || - ((fra[db.fra_pos].gt_lt_sign == IFTIME_LESS_THEN) && + ((fra[db.fra_pos].gt_lt_sign & IFTIME_LESS_THEN) && (fra[db.fra_pos].ignore_file_time < diff_time)) || - ((fra[db.fra_pos].gt_lt_sign == IFTIME_GREATER_THEN) && + ((fra[db.fra_pos].gt_lt_sign & IFTIME_GREATER_THEN) && (fra[db.fra_pos].ignore_file_time > diff_time))) { *file_size_to_retrieve += rl[i].size; @@ -893,11 +893,11 @@ *file_size_to_retrieve += p_stat_buf->st_size; if ((fra[db.fra_pos].ignore_size == 0) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_EQUAL) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_EQUAL) && (fra[db.fra_pos].ignore_size == rl[*no_of_listed_files].size)) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_LESS_THEN) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_LESS_THEN) && (fra[db.fra_pos].ignore_size < rl[*no_of_listed_files].size)) || - ((fra[db.fra_pos].gt_lt_sign == ISIZE_GREATER_THEN) && + ((fra[db.fra_pos].gt_lt_sign & ISIZE_GREATER_THEN) && (fra[db.fra_pos].ignore_size > rl[*no_of_listed_files].size))) { if ((rl[*no_of_listed_files].got_date == NO) || @@ -910,11 +910,11 @@ time_t diff_time; diff_time = current_time - rl[*no_of_listed_files].file_mtime; - if (((fra[db.fra_pos].gt_lt_sign == IFTIME_EQUAL) && + if (((fra[db.fra_pos].gt_lt_sign & IFTIME_EQUAL) && (fra[db.fra_pos].ignore_file_time == diff_time)) || - ((fra[db.fra_pos].gt_lt_sign == IFTIME_LESS_THEN) && + ((fra[db.fra_pos].gt_lt_sign & IFTIME_LESS_THEN) && (fra[db.fra_pos].ignore_file_time < diff_time)) || - ((fra[db.fra_pos].gt_lt_sign == IFTIME_GREATER_THEN) && + ((fra[db.fra_pos].gt_lt_sign & IFTIME_GREATER_THEN) && (fra[db.fra_pos].ignore_file_time > diff_time))) { (*no_of_listed_files)++;