From 8813a85304e9e2551ee8a1fcea6ead456376e07d Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 10 Jun 2012 08:29:57 +0000 Subject: [PATCH] Fixed false error with -as mkisofs option -hfsplus. Introduced by rev 4750. --- xorriso/emulators.c | 2 ++ xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xorriso/emulators.c b/xorriso/emulators.c index ffda6747..b1e5170c 100644 --- a/xorriso/emulators.c +++ b/xorriso/emulators.c @@ -1522,6 +1522,8 @@ illegal_c:; if(argv[i] != argpt) delay_opt_list[delay_opt_count - 1]|= 1<<31; i+= arg_count; + } else if(strcmp(argpt, "-hfsplus") == 0) { + /* was already handled in first argument scan */; } else if(strcmp(argpt, "-hfsplus-serial-no") == 0) { if(i+1>=argc) goto not_enough_args; diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index f2e4a13f..eff2083e 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.06.08.071018" +#define Xorriso_timestamP "2012.06.10.083050"