aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeebs <seebs@seebs.net>2016-11-03 11:35:34 -0500
committerSeebs <seebs@seebs.net>2016-11-03 11:35:34 -0500
commit1ee120addb9e757d40639a8a75a93dff36fe8e3c (patch)
tree8df9e592aecfc1469f839a3be62814b3c2766025
parentd5a6b5e2d23288452b374a1ffe32b6b3e52c13fc (diff)
downloadpseudo-1ee120addb9e757d40639a8a75a93dff36fe8e3c.tar.gz
pseudo-1ee120addb9e757d40639a8a75a93dff36fe8e3c.tar.bz2
pseudo-1ee120addb9e757d40639a8a75a93dff36fe8e3c.zip
Revert "Fix extra data on xattrs"
This reverts commit d5a6b5e2d23288452b374a1ffe32b6b3e52c13fc. (Because it turns out I was wrong.)
-rw-r--r--ChangeLog.txt4
-rw-r--r--pseudo.c7
2 files changed, 2 insertions, 9 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index d2e8618..6466806 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,8 +1,4 @@
2016-10-31:
- * (seebs) match comments by ACTUALLY trimming the null byte
- on xattrs on write.
-
-2016-10-31:
* (seebs) drop silly if
2016-10-29:
diff --git a/pseudo.c b/pseudo.c
index df2a419..db1c400 100644
--- a/pseudo.c
+++ b/pseudo.c
@@ -496,13 +496,10 @@ pseudo_op(pseudo_msg_t *msg, const char *program, const char *tag, char **respon
/* For a rename op, we want to strip any trailing
* slashes. For xattr, "oldpath" is the raw data
* to be stored. */
- if (msg->op == OP_RENAME) {
- if (oldpathlen > 0 && oldpath[oldpathlen - 1] == '/') {
+ if (oldpathlen > 0 && msg->op == OP_RENAME) {
+ if (oldpath[oldpathlen - 1] == '/') {
oldpath[--oldpathlen] = '\0';
}
- } else {
- /* disregard the trailing null */
- --oldpathlen;
}
/* if we got an oldpath, but a 0-length initial
* path, we don't want to act as though we had