From fca4b8e2df23c215604f2c9f9be9eb97efefde6c Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Wed, 9 Jan 2008 17:55:27 +0000
Subject: [PATCH] Corrections made during porting to nglibisofs

---
 libisoburn/trunk/test/xorriso_timestamp.h |  2 +-
 libisoburn/trunk/test/xorrisoburn.c       | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/libisoburn/trunk/test/xorriso_timestamp.h b/libisoburn/trunk/test/xorriso_timestamp.h
index f502eb21..cedbdab9 100644
--- a/libisoburn/trunk/test/xorriso_timestamp.h
+++ b/libisoburn/trunk/test/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.01.02.175011"
+#define Xorriso_timestamP "2008.01.09.175418"
diff --git a/libisoburn/trunk/test/xorrisoburn.c b/libisoburn/trunk/test/xorrisoburn.c
index 46d259c2..ae196f5d 100644
--- a/libisoburn/trunk/test/xorrisoburn.c
+++ b/libisoburn/trunk/test/xorrisoburn.c
@@ -916,7 +916,8 @@ cannot_lstat:;
          ret= Xorriso_transfer_properties(xorriso, &stbuf, node, 0);
          if(ret<=0)
            goto was_problem;
-       }
+       } else
+         {ret= 0; goto was_problem;}
      } else
        node= iso_tree_add_node(dir, srcpt);
    }
@@ -1874,7 +1875,8 @@ int Xorriso_sorted_node_array(struct XorrisO *xorriso,
  *nodec= i;
  if(*nodec<=0)
    return(1);
- qsort(*node_array, *nodec, sizeof(struct iso_tree *), Xorriso__node_name_cmp);
+ qsort(*node_array, *nodec, sizeof(struct iso_tree_node *),
+       Xorriso__node_name_cmp);
  return(1);
 }
 
@@ -2923,17 +2925,10 @@ int Xorriso_findi(struct XorrisO *xorriso, struct FindjoB *job,
    if(ret<0)
      goto ex;
    if(ret>0) {
-
-#ifdef NIX
-     sprintf(xorriso->result_line, "%s\n", Text_shellsafe(dir_path, sfe, 0));
-     Xorriso_result(xorriso, 0);
-#else
      ret= Xorriso_findi_action(xorriso, job, path, dir_path, 
                                (struct iso_tree_node *) dir_node, depth, 0);
      if(ret<=0)
        goto ex;
-#endif /* ! NIX */
-
    }
  }
  if(!LIBISO_ISDIR((struct iso_tree_node *) dir_node))