From d574a69834a4bf78d34867476a13067716288a02 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 15 Nov 2017 11:13:30 +0100 Subject: [PATCH] Fixing bug from rev cbc5dbf: unknown -xattr mode caused mode "off" --- xorriso/opts_p_z.c | 12 ++++++------ xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xorriso/opts_p_z.c b/xorriso/opts_p_z.c index 08475c05..4d19f8da 100644 --- a/xorriso/opts_p_z.c +++ b/xorriso/opts_p_z.c @@ -2189,14 +2189,14 @@ int Xorriso_option_xattr(struct XorrisO *xorriso, char *mode, int flag) { int ret; - xorriso->do_aaip&= ~(4 | 8 | 1024); - if(strcmp(mode, "off")==0) - ; - else if(strcmp(mode, "on") == 0 || strcmp(mode, "user") == 0) + if(strcmp(mode, "off") == 0) { + xorriso->do_aaip&= ~(4 | 8 | 1024); + } else if(strcmp(mode, "on") == 0 || strcmp(mode, "user") == 0) { + xorriso->do_aaip&= ~1024; xorriso->do_aaip|= (4 | 8); - else if(strcmp(mode, "any")==0) + } else if(strcmp(mode, "any") == 0) { xorriso->do_aaip|= (4 | 8 | 1024); - else { + } else { sprintf(xorriso->info_text, "-xattr: unknown mode '%s'", mode); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); return(0); diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index d33cd04b..5797b53c 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2017.11.15.100856" +#define Xorriso_timestamP "2017.11.15.101228"