aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2006-07-16 14:53:43 +0200
committerWilly Tarreau <willy@wtap.(none)>2006-07-26 11:54:22 +0200
commitf4fa4dd92ff99875a83fd8494b7b3d633614ec79 (patch)
treeebec0a2007b8c33dfca59caf1a39c767d16c1d84
parent[RELEASE] flxutils-0.1.25 (diff)
downloadflxutils-f4fa4dd92ff99875a83fd8494b7b3d633614ec79.tar.gz
[RELEASE] flxutils-0.1.26v0.1.26
-rw-r--r--ChangeLog4
-rw-r--r--flx/ChangeLog3
-rw-r--r--flx/Makefile2
-rw-r--r--flx/fct1.c4
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0884096..55e8ca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,3 +80,7 @@
- removed debugging defines from init which prevented it from working anymore
in 0.1.24
+2004/12/14 : Version 0.6.9
+ - fixed a bug in fct1.c where two different but valid links would
+ not be reported as different.
+
diff --git a/flx/ChangeLog b/flx/ChangeLog
index 0e71676..4e61cdf 100644
--- a/flx/ChangeLog
+++ b/flx/ChangeLog
@@ -1,3 +1,6 @@
+2004/12/14 : Version 0.6.9
+- fixed a bug in fct1.c where two different but valid links would
+ not be reported as different.
2004/11/21 : Version 0.6.8
- now compiles with gcc-3.3
2003/06/05 : Version 0.6.7
diff --git a/flx/Makefile b/flx/Makefile
index 0a92cdc..d78b873 100644
--- a/flx/Makefile
+++ b/flx/Makefile
@@ -26,7 +26,7 @@
NAME=flx
-VERSION=0.6.8
+VERSION=0.6.9
SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \
input.c input_fs.c input_file.c \
output.c output_file.c
diff --git a/flx/fct1.c b/flx/fct1.c
index 811391a..6402f50 100644
--- a/flx/fct1.c
+++ b/flx/fct1.c
@@ -98,9 +98,9 @@ int files_are_the_same(t_file_desc *f1, t_file_desc *f2, int Diff, char *path)
if (!f2->md5) f2->md5 = checksum_md5_from_data(temp, l);
}
}
- if (strcmp(f1->link, f2->link))
- diff |= DIFF_LINK; /* links differ */
}
+ if (!(diff & DIFF_LINK) && strcmp(f1->link, f2->link))
+ diff |= DIFF_LINK; /* links differ */
}
}
if (DIFF(CHECKSUM) && S_ISREG(f1->stat.st_mode) && S_ISREG(f2->stat.st_mode)) {