From c17edd608ec7efdf4b5bfb85eaa1990aacd78de2 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 30 Oct 2008 11:01:58 +0000 Subject: [PATCH] Made -as mkisofs -path-list and --quoted_path_list switch pacifier mode --- xorriso/xorriso.c | 15 ++++++--------- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c index 814c706a..2feef340 100644 --- a/xorriso/xorriso.c +++ b/xorriso/xorriso.c @@ -9409,7 +9409,8 @@ no_volunteer:; xorriso->do_joliet= 1; } else if(strcmp(argv[i], "-graft-points")==0) { xorriso->allow_graft_points= 1; - } else if(strcmp(argv[i], "-path-list")==0) { + } else if(strcmp(argv[i], "-path-list")==0 || + strcmp(argv[i], "--quoted_path_list")==0) { if(i+1>=argc) { not_enough_args:; sprintf(xorriso->info_text, "-as %s: Not enough arguments to option %s", @@ -9418,16 +9419,12 @@ not_enough_args:; ret= 0; goto ex; } i++; - ret= Xorriso_option_path_list(xorriso, argv[i], 0); - if(ret<=0) - goto ex; - } else if(strcmp(argv[i], "--quoted_path_list")==0) { - if(i+1>=argc) - goto not_enough_args; - i++; - ret= Xorriso_option_path_list(xorriso, argv[i], 1); + ret= Xorriso_option_path_list(xorriso, argv[i], + (strcmp(argv[i-1], "--quoted_path_list")==0)); if(ret<=0) goto ex; + was_path= 1; + xorriso->pacifier_style= 1; } else if(strcmp(argv[i], "-f")==0 || strcmp(argv[i], "-follow-links")==0) { /* was already handled in first argument scan */; } else if(strcmp(argv[i], "-pad")==0) { diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 7991d1fe..74a06aff 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.10.27.142720" +#define Xorriso_timestamP "2008.10.30.110049"