From 53048cfa6e4117b9b043119f6081a83ae76c75b2 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Wed, 18 May 2011 06:34:47 +0000
Subject: [PATCH] Fixed refusal to run with command -as introduced by rev 3819

---
 libisoburn/trunk/xorriso/parse_exec.c        | 10 +++++++---
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libisoburn/trunk/xorriso/parse_exec.c b/libisoburn/trunk/xorriso/parse_exec.c
index 45197531..1728643e 100644
--- a/libisoburn/trunk/xorriso/parse_exec.c
+++ b/libisoburn/trunk/xorriso/parse_exec.c
@@ -1657,9 +1657,13 @@ protect_stdout:;
      was_return_with= 1;
 
    } else if(strcmp(cmd,"as")==0 && was_dashed == 1) {
-     if(strcmp(arg1, "mkisofs")==0 || strcmp(arg1, "genisoimage")==0 ||
-        strcmp(arg1, "genisofs")==0 || strcmp(arg1, "xorrisofs")==0)
-       goto protect_stdout;
+     ret= Xorriso_count_args(xorriso, argc - i, argv + i, &arg_count, 1);
+     if(ret == 1)
+       i+= arg_count;
+     if(was_dashed == 1)
+       if(strcmp(arg1, "mkisofs")==0 || strcmp(arg1, "genisoimage")==0 ||
+          strcmp(arg1, "genisofs")==0 || strcmp(arg1, "xorrisofs")==0)
+         goto protect_stdout;
 
    } else if(strcmp(cmd, "list_delimiter") == 0) {
      /* Needed for interpreting other args. Gets reset after prescan. */
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index d627c181..f4f8f7c4 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.05.17.151719"
+#define Xorriso_timestamP "2011.05.18.063511"