From 9846ae3b176f6dc3034262e3c44c4895a6e1565f Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Wed, 5 Dec 2007 09:06:00 +0000
Subject: [PATCH] Option -f-off as counterpart of option -f

---
 libisoburn/trunk/test/xorriso.1           |  7 +++++--
 libisoburn/trunk/test/xorriso.c           | 12 ++++++++++--
 libisoburn/trunk/test/xorriso.h           |  3 ++-
 libisoburn/trunk/test/xorriso_timestamp.h |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/libisoburn/trunk/test/xorriso.1 b/libisoburn/trunk/test/xorriso.1
index be0343fa..69b32530 100644
--- a/libisoburn/trunk/test/xorriso.1
+++ b/libisoburn/trunk/test/xorriso.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH XORRISO 1 "December 4, 2007"
+.TH XORRISO 1 "December 5, 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -573,7 +573,10 @@ SORRY event occured.
 .B Settings for data insertion:
 .TP
 > \fB\-f\fR
-Follow  symbolic links.
+Follow symbolic links under disk_paths.
+.TP
+> \fB\-f-off\fR
+Do not follow symbolic links under disk_paths.
 .TP
 \fB\-graft-points\fR
 For xorriso action -add this enables pathspecs of the form
diff --git a/libisoburn/trunk/test/xorriso.c b/libisoburn/trunk/test/xorriso.c
index d741f8c7..9883db99 100644
--- a/libisoburn/trunk/test/xorriso.c
+++ b/libisoburn/trunk/test/xorriso.c
@@ -3461,6 +3461,9 @@ int Xorriso_status(struct XorrisO *xorriso, char *filter, FILE *fp, int flag)
  if(xorriso->do_follow_links) {
    sprintf(line,"-f\n");
    Xorriso_status_result(xorriso,filter,fp,flag&2);
+ } else if(!no_defaults) {
+   sprintf(line,"-f-off\n");
+   Xorriso_status_result(xorriso,filter,fp,flag&2);
  }
 
  is_default= (xorriso->do_overwrite==2);
@@ -5516,10 +5519,11 @@ int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,int flag)
 }
 
 
-/* Option -f */
+/* Options -f and -f-off */
+/* @param flag bit0= -f-off */
 int Xorriso_option_f(struct XorrisO *xorriso, int flag)
 {
- xorriso->do_follow_links= 1;
+ xorriso->do_follow_links= !(flag&1);
  return(1);
 }
 
@@ -5693,6 +5697,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
 "  --             Mark end of particular action argument list.",
 "",
 "> -f             Follow symbolic links within disk_path.",
+"> -f-off         Do not follow symbolic links within disk_path.",
 "",
 "  -overwrite \"on\"|\"nondir\"|\"off\"",
 "                 Allow or disallow to overwrite existing files in ISO image.",
@@ -6963,6 +6968,9 @@ next_command:;
  } else if(strcmp(cmd,"-f")==0) {
    ret= Xorriso_option_f(xorriso, 0);
 
+ } else if(strcmp(cmd,"-f-off")==0 || strcmp(cmd,"-f_off")==0) {
+   ret= Xorriso_option_f(xorriso, 1);
+
  } else if(strcmp(cmd,"-find")==0 || strcmp(cmd,"-findi")==0) {
    (*idx)++;
    ret= Xorriso_option_findi(xorriso, arg1, 0);
diff --git a/libisoburn/trunk/test/xorriso.h b/libisoburn/trunk/test/xorriso.h
index fdf40779..a96ab87b 100644
--- a/libisoburn/trunk/test/xorriso.h
+++ b/libisoburn/trunk/test/xorriso.h
@@ -201,7 +201,8 @@ int Xorriso_option_end(struct XorrisO *xorriso, int flag);
 int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,
                                   int flag);
 
-/* Option -f */ 
+/* Options -f and -f-off */
+/* @param flag bit0= -f-off */
 int Xorriso_option_f(struct XorrisO *xorriso, int flag);
 
 /* Option -find alias -findi */
diff --git a/libisoburn/trunk/test/xorriso_timestamp.h b/libisoburn/trunk/test/xorriso_timestamp.h
index 322c8356..270a133b 100644
--- a/libisoburn/trunk/test/xorriso_timestamp.h
+++ b/libisoburn/trunk/test/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2007.12.04.205919"
+#define Xorriso_timestamP "2007.12.05.090438"