projects
/
finddup.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3506453
)
Put the read buffers on the heap instead of the stack.
author
Francois Fleuret
<francois@fleuret.org>
Thu, 11 Mar 2010 17:25:50 +0000
(18:25 +0100)
committer
Francois Fleuret
<francois@fleuret.org>
Thu, 11 Mar 2010 17:25:50 +0000
(18:25 +0100)
finddup.c
patch
|
blob
|
history
diff --git
a/finddup.c
b/finddup.c
index
9b65d40
..
ab345d3
100644
(file)
--- a/
finddup.c
+++ b/
finddup.c
@@
-139,9
+139,9
@@
int file_list_length(struct file_with_size *head) {
/**********************************************************************/
/**********************************************************************/
-int same_content(struct file_with_size *f1, struct file_with_size *f2) {
+int same_content(struct file_with_size *f1, struct file_with_size *f2,
+ char *buffer1, char *buffer2) {
int fd1, fd2, s1, s2;
int fd1, fd2, s1, s2;
- char buffer1[READ_BUFFER_SIZE], buffer2[READ_BUFFER_SIZE];
fd1 = open(f1->filename, O_RDONLY);
fd2 = open(f2->filename, O_RDONLY);
fd1 = open(f1->filename, O_RDONLY);
fd2 = open(f2->filename, O_RDONLY);
@@
-194,11
+194,12
@@
int same_content(struct file_with_size *f1, struct file_with_size *f2) {
}
}
}
}
-int same_files(struct file_with_size *f1, struct file_with_size *f2) {
+int same_files(struct file_with_size *f1, struct file_with_size *f2,
+ char *buffer1, char *buffer2) {
if(ignore_same_inode && f1->inode == f2->inode) {
return 0;
}
if(ignore_same_inode && f1->inode == f2->inode) {
return 0;
}
- return f1->size == f2->size && same_content(f1, f2);
+ return f1->size == f2->size && same_content(f1, f2
, buffer1, buffer2
);
}
/**********************************************************************/
}
/**********************************************************************/
@@
-362,6
+363,9
@@
void start(const char *dirname1, const char *dirname2) {
int not_in, found;
int k, pp, l1, n;
int not_in, found;
int k, pp, l1, n;
+ char *buffer1 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
+ char *buffer2 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
+
not_in = 0;
if(show_progress) {
not_in = 0;
if(show_progress) {
@@
-403,7
+407,7
@@
void start(const char *dirname1, const char *dirname2) {
found = 0;
for(node2 = list2; !found && node2; node2 = node2->next) {
found = 0;
for(node2 = list2; !found && node2; node2 = node2->next) {
- if(same_files(node1, node2)) {
+ if(same_files(node1, node2
, buffer1, buffer2
)) {
found = 1;
}
}
found = 1;
}
}
@@
-424,7
+428,7
@@
void start(const char *dirname1, const char *dirname2) {
for(node2 = list2; node2; node2 = node2->next) {
if(node1->group_id < 0 || node2->group_id < 0) {
for(node2 = list2; node2; node2 = node2->next) {
if(node1->group_id < 0 || node2->group_id < 0) {
- if(same_files(node1, node2)) {
+ if(same_files(node1, node2
, buffer1, buffer2
)) {
if(node1->group_id < 0) {
if(node2->group_id >= 0) {
node1->group_id = node2->group_id;
if(node1->group_id < 0) {
if(node2->group_id >= 0) {
node1->group_id = node2->group_id;
@@
-456,6
+460,9
@@
void start(const char *dirname1, const char *dirname2) {
print_result(list1, 0);
file_list_delete(list1);
}
print_result(list1, 0);
file_list_delete(list1);
}
+
+ free(buffer1);
+ free(buffer2);
}
void print_help(FILE *out) {
}
void print_help(FILE *out) {