From: Charles Manning Date: Sat, 30 May 2015 23:45:03 +0000 (+1200) Subject: yaffs direct: Fix wrong condition for O_CREAT | O_EXCL X-Git-Tag: aleph1-release~26 X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=6f398a8b6eab8d0c61010c144f01d706dc0dad8b;hp=e8bdf6a905e8e37b82fb310306f96ab4de930923 yaffs direct: Fix wrong condition for O_CREAT | O_EXCL Thanks Chris for pointing this out. Signed-off-by: Charles Manning --- diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index 7afde71..952ffac 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -853,7 +853,7 @@ int yaffs_open_sharing_reldir(struct yaffs_obj *reldir, const YCHAR *path, oflag &= ~(O_EXCL); /* O_TRUNC has no meaning if (O_CREAT | O_EXCL) is specified */ - if ((oflag & O_CREAT) & (oflag & O_EXCL)) + if ((oflag & O_CREAT) && (oflag & O_EXCL)) oflag &= ~(O_TRUNC); /* Todo: Are there any more flag combos to sanitise ? */