aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2015-05-04 14:21:05 -0500
committerPeter Seebach <peter.seebach@windriver.com>2015-05-04 14:21:05 -0500
commitdb758fb11167c79d9682a17d359568e2a3c4acd5 (patch)
tree95a277acb9cbaef9029653606e81090696ee0ec6
parent41389d4279d6a5f694615906217f481605b183b7 (diff)
downloadpseudo-PSEUDO_1_6_5.tar.gz
pseudo-PSEUDO_1_6_5.tar.bz2
pseudo-PSEUDO_1_6_5.zip
reduce spurious messages about trailing slashespseudo-1.6.5PSEUDO_1_6_5
There was supposed to be a check for filenames showing up with a trailing slash when the file was not a directory. What actually made it in was a check for a mismatch between "is a directory" and "has trailing slash", which produced spurious messages saying the path had a trailing slash whenever a directory path did *not* have a trailing slash. But that's valid and should not produce diagnostics. Let alone thousands of diagnostics. Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
-rw-r--r--ChangeLog.txt4
-rw-r--r--Makefile.in2
-rw-r--r--pseudo.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index bda0903..08dbd4d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,7 @@
+2015-05-04:
+ * (seebs) don't give spurious trailing slash diagnostics
+ * 1.6.5
+
2015-01-22:
* (seebs) work when --prefix doesn't exist yet
* 1.6.4
diff --git a/Makefile.in b/Makefile.in
index 20571b6..f4e9cac 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,7 +31,7 @@ BITS=@BITS@
ARCH_FLAGS=@ARCH_FLAGS@
MARK64=@MARK64@
RPATH=@RPATH@
-VERSION=1.6.4
+VERSION=1.6.5
LIB=@LIB@
BIN=bin
diff --git a/pseudo.c b/pseudo.c
index 5eae180..c089869 100644
--- a/pseudo.c
+++ b/pseudo.c
@@ -682,7 +682,7 @@ pseudo_op(pseudo_msg_t *msg, const char *program, const char *tag, char **respon
pdb_unlink_file_dev(&by_path);
found_path = 0;
}
- if (!!S_ISDIR(by_path.mode) != trailing_slash) {
+ if (trailing_slash && !S_ISDIR(by_path.mode)) {
pseudo_diag("dir quasi-mismatch: '%s' [%llu] db mode 0%o, incoming path had trailing slash. Not unlinking.\n",
msg->path, (unsigned long long) by_path.ino,
(int) by_path.mode);