From 1a1694d5952555bfec7d5165d48cf7c495d5b48c Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Mon, 7 Apr 2008 20:13:01 +0000
Subject: [PATCH] Removed some unused code

---
 xorriso/xorriso.c           | 883 +-----------------------------------
 xorriso/xorriso_timestamp.h |   2 +-
 xorriso/xorrisoburn.c       |  30 +-
 3 files changed, 31 insertions(+), 884 deletions(-)

diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c
index f0c802a4..18f8ecfe 100644
--- a/xorriso/xorriso.c
+++ b/xorriso/xorriso.c
@@ -153,14 +153,6 @@ char *Sfile_fgets(char *line, int maxl, FILE *fp)
 }
 
 
-int Sfile_fclose(FILE *fp)
-{
- if(fp!=stdout && fp!=stdin && fp!=NULL)
-   fclose(fp);
- return(1);
-}
-
-
 int Sfile_count_components(char *path, int flag)
 /*
  bit0= do not ignore trailing slash
@@ -365,159 +357,6 @@ int Sfile_type(char *filename, int flag)
 }
 
 
-int Sfile_lookup_permissions(char *fname, int *perms, mode_t *st_mode,int flag)
-/* @param perms  bit0= r , bit1= w , bit2= x */
-/* return: <0 fatal error, 0= file nonexistent, 1=owner, 2=group, 3=other */
-{
- struct stat stbuf;
- int is_root;
-
- *perms= 0;
- if(stat(fname,&stbuf)==-1)
-   return(0);
- *st_mode= stbuf.st_mode;
- is_root= (geteuid()==0);
- if(is_root) /* root can always read and write */
-   *perms= 3;
- if(is_root || geteuid()==stbuf.st_uid) {
-   if(stbuf.st_mode & S_IRUSR)
-     (*perms)|= 1; 
-   if(stbuf.st_mode & S_IWUSR)
-     (*perms)|= 2; 
-   if(stbuf.st_mode & S_IXUSR)
-     (*perms)|= 4; 
-   if(!is_root)
-     return(1);
- }
- /* group membership is a complicated thing */
- if(is_root || Sfile_being_group_member(&stbuf,0)>0) {
-   if(stbuf.st_mode & S_IRGRP)
-     (*perms)|= 1; 
-   if(stbuf.st_mode & S_IWGRP)
-     (*perms)|= 2; 
-   if(stbuf.st_mode & S_IXGRP)
-     (*perms)|= 4; 
-   if(!is_root)
-     return(2);
- }
- if(stbuf.st_mode & S_IROTH)
-   (*perms)|= 1; 
- if(stbuf.st_mode & S_IWOTH)
-   (*perms)|= 2; 
- if(stbuf.st_mode & S_IXOTH)
-   (*perms)|= 4; 
- if(is_root)
-   return(1);
- return(3);
-}
-
-
-int Sfile_select(int *fds, int fdcount, int fdidx[3], unsigned int microsec,
-                 int flag)
-/*
- bit0= check for reading (and choose one into fdidx[0])
- bit1= check for writing (and choose one into fdidx[1])
- bit2= check for exception (and choose one into fdidx[2])
- bit3= initialize fdidx
-return-bits are set according to matching flag-bits
-*/
-{
- struct timeval wt;
- fd_set rds,wts,exs,*s;
- int ready,ret,i,j,max_fd= -1;
-
- if(flag&8)
-   for(j=0;j<3;j++)
-     fdidx[j]= 0;
- wt.tv_sec=  microsec/1000000;
- wt.tv_usec= microsec%1000000;
- FD_ZERO(&rds);
- FD_ZERO(&wts);
- FD_ZERO(&exs);
- for(i= 0;i<fdcount;i++) {
-   if(fds[i]<0)
- continue;
-   if(flag&1)
-     FD_SET(fds[i],&rds);
-   if(flag&2)
-     FD_SET(fds[i],&wts);
-   if(flag&4)
-     FD_SET(fds[i],&exs);
-   if(fds[i]>max_fd)
-     max_fd= fds[i];
- }
- ready= select(max_fd+1,&rds,&wts,&exs,&wt);
- if(ready<=0)
-   return(0);
- ret= 0;
- if(fdcount>0)
-   for(j=0;j<2;j++)
-     fdidx[j]= (fdidx[j]+1)%fdcount;
- for(i= 0;i<fdcount;i++) {
-   for(j=0;j<3;j++) {
-     if(j==0)
-       s= &rds;
-     else if(j==1)
-       s= &wts;
-     else
-       s= &exs;
-     if((flag&(1<<j)) && !(ret&(1<<j))) {
-       if(fds[fdidx[j]]<0) 
-         fdidx[j]= (fdidx[j]+1)%fdcount;
-       else if(FD_ISSET(fds[fdidx[j]],s))
-         ret|= (1<<j);
-       else
-         fdidx[j]= (fdidx[j]+1)%fdcount;
-     }
-   }
- }
- return(ret);
-}
-
-
-int Sfile_identical(char *file1, char *file2, int flag)
-/*
- bit0= check whether it is the same  i-node 
-*/
-{
- FILE *fp1,*fp2;
- struct stat stbuf;
- int ret,c1,c2;
- ino_t ino1,ino2;
- dev_t dev1,dev2;
-
- ret= 0;
-
- if(flag&1){
-   if(stat(file1,&stbuf)==-1) return(0);
-   ino1= stbuf.st_ino;
-   dev1= stbuf.st_dev;
-   if(stat(file2,&stbuf)==-1) return(0);
-   ino2= stbuf.st_ino;
-   dev2= stbuf.st_dev;
-   return((ino1==ino2) && (dev1==dev2));
- }
-
- fp1= fopen(file1,"rb");
- fp2= fopen(file2,"rb");
- if(fp1==NULL||fp2==NULL) goto fertig;
- while(1){
-   c1= fgetc(fp1);
-   c2= fgetc(fp2);
-   if(c1==EOF && c2==EOF){
-     ret= 1;
- break;
-   }
-   if(c1!=c2)
- break;
- }
-fertig:;
- if(fp1!=NULL) fclose(fp1);
- if(fp2!=NULL) fclose(fp2);
- return(ret);
-}
-
-
 char *Sfile_datestr(time_t tim, short int flag)
 /*
  bit0=with hours+minutes  
@@ -1010,21 +849,6 @@ int Sort_argv(int argc, char **argv, int flag)
 }
 
 
-int Set_bit(int *data, int idx, int flag)
-/*
- bit0= clear bit
-*/
-{
- if(idx<0 || idx>31)
-   return(0);
- if(flag&1)
-   (*data)&= ~(1<<idx);
- else
-   (*data)|= (1<<idx);
- return(1);
-}
-
-
 FILE *Afile_fopen(char *filename, char *mode, int flag)
 /*
  bit0= do not print error message on failure
@@ -1630,108 +1454,6 @@ int Sregex_string(char **handle, char *text, int flag)
  return(ret);
 }
 
-
-/*
-  from Juergen Helbing's  yencode-c.txt 
-  found at  www.yenc.org  , Feb 4,  2002
-  license : "It is public domain - as well as the yEnc specification"
-  some alterations made to adapt it to Sregex_crc32() 
-
-  seems to be compatible with SFV/CSV files
-*/                       
-
-int Sregex_crc32_yenc(char *data, int len, unsigned long *crc, int flag)
-/*
- bit0= start of data polynom
-*/
-{
- /* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */
- static unsigned long crc_tab[256] = {
-   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 
-   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
-   0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-   0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
-   0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
-   0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-   0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
-   0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
-   0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-   0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-   0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
-   0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-   0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
-   0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
-   0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-   0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
-   0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
-   0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-   0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
-   0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
-   0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-   0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
-   0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
-   0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-   0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
-   0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
-   0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-   0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
-   0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
-   0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-   0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
-   0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
-   0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-   0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
-   0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-   0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-   0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
-   0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
-   0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-   0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
-   0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
-   0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-   0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
-   0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
-   0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-   0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
-   0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
-   0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-   0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
-   0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
-   0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-   0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
-   0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
-   0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-   0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
-   0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
-   0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-   0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
-   0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
-   0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-   0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
-   0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
-   0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-   0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-};
-
- int k;
- unsigned long crc_val,ch1,ch2,cc;
-
- if(flag&1)
-   crc_val = ~0;
- else
-   crc_val = ~*crc;
-
- for(k=0;k<len;k++) {
-   cc= data[k] & 0xffL;
-   ch1= (crc_val ^ cc) & 0xffL;
-   ch1= crc_tab[ch1];
-   ch2= (crc_val>>8L) & 0xffffffL;
-   crc_val= ch1 ^ ch2;
- }
- *crc= ~crc_val;
- return(1);
-}
-
 #endif /*  Xorriso_sregex_externaL */
 
 
@@ -1799,188 +1521,9 @@ int Fileliste__target_source_limit(char *line, char sep, char **limit_pt,
  return(npt!=NULL);
 }
 
-
-int Fileliste__unescape_target(char *line, char *endpt, char sep, int flag)
-{
- char *wpt,*rpt;
-
- if(endpt==NULL)
-   endpt= line+strlen(line);
-
- /* unescape sep and '\\' */
- wpt= line;
- for(rpt= line; rpt<endpt; rpt++) {
-   if(*rpt=='\\') {
-     if(*(rpt+1)==sep || *(rpt+1)=='\\')
-       rpt++;
-   }
-   *(wpt++)= *rpt;
- }
- *wpt= 0;
- return(1);
-} 
-
-
-int Fileliste__escape_target(char *target, int flag)
-{
- int i,offset= 0;
- /* escape '=' and '\\' in target address */
- for(i= strlen(target)-1;i>=0;i--)
-   if(target[i]=='=' || target[i]=='\\')
-     offset++;
- target[strlen(target)+offset]= 0;
- for(i= strlen(target)-1;i>=0;i--) {
-   if(target[i]=='=' || target[i]=='\\') {
-     target[i+offset]= target[i];
-     offset--;
-     target[i+offset]= '\\';
-   } else {
-     target[i+offset]= target[i];
-   }
- }
- return(1);
-}
-
 #endif /* ! Xorriso_fileliste_externaL */
 
 
-#define Xorriso_cleanup_externaL 1
-#ifndef Xorriso_cleanup_externaL
-
-/* <<< ??? ts A71006 : will this be replaced by the libburn signal handler ? */
-
-#include <signal.h>
-typedef void (*sighandler_t)(int);
-
-
-/* Signals to be caught */
-static int signal_list[]= {
- SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT,
- SIGFPE, SIGSEGV, SIGPIPE, SIGALRM, SIGTERM,
- SIGUSR1, SIGUSR2, SIGXCPU, SIGTSTP, SIGTTIN,
- SIGTTOU,
- SIGBUS, SIGPOLL, SIGPROF, SIGSYS, SIGTRAP,
- SIGVTALRM, SIGXCPU, SIGXFSZ, -1
-};
-static char *signal_name_list[]= {
- "SIGHUP", "SIGINT", "SIGQUIT", "SIGILL", "SIGABRT",
- "SIGFPE", "SIGSEGV", "SIGPIPE", "SIGALRM", "SIGTERM",
- "SIGUSR1", "SIGUSR2", "SIGXCPU", "SIGTSTP", "SIGTTIN",
- "SIGTTOU",
- "SIGBUS", "SIGPOLL", "SIGPROF", "SIGSYS", "SIGTRAP",
- "SIGVTALRM", "SIGXCPU", "SIGXFSZ", "@"
-};
-static int signal_list_count= 24;
-
-
-/* Signals not to be caught */
-static int non_signal_list[]= {
-  SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH, -1
-};
-static int non_signal_list_count= 5;
-
-
-/* run time dynamic part */
-static char cleanup_msg[SfileadrL]= {""};
-static int cleanup_exiting= 0;
-
-static void *cleanup_app_handle= NULL;
-static Cleanup_app_handler_T cleanup_app_handler= NULL;
-static int cleanup_perform_app_handler_first= 0;
-
-
-static int Cleanup_handler_exit(int exit_value, int signum, int flag)
-{
- int ret;
-
- if(cleanup_perform_app_handler_first)
-   if(cleanup_app_handler!=NULL) {
-     ret= (*cleanup_app_handler)(cleanup_app_handle,signum,0);
-     if(ret==2)
-       return(2);
-   }
- if(cleanup_exiting) {
-   if(cleanup_msg[0]!=0)
-     fprintf(stderr,"%s\n",cleanup_msg);
-   fprintf(stderr,"cleanup: ABORT : repeat by pid=%d, signum=%d\n",
-           getpid(),signum);
-   return(0);
- }
- cleanup_exiting= 1;
- if(cleanup_msg[0]!=0)
-   fprintf(stderr,"%s\n",cleanup_msg);
- alarm(0);
- if(!cleanup_perform_app_handler_first)
-   if(cleanup_app_handler!=NULL)
-     (*cleanup_app_handler)(cleanup_app_handle,signum,0);
- exit(exit_value);
-}
-
-
-static void Cleanup_handler_generic(int signum)
-{
- int i;
-
- sprintf(cleanup_msg,"UNIX-SIGNAL caught:  %d  errno= %d",signum,errno);
- for(i= 0; i<signal_list_count; i++)
-   if(signum==signal_list[i]) {
-     sprintf(cleanup_msg,"UNIX-SIGNAL:  %s  errno= %d",
-             signal_name_list[i],errno);
- break;
-   }
- Cleanup_handler_exit(1,signum,0);
-}
-
-
-static int Cleanup_set_handlers(void *handle,
-                                Cleanup_app_handler_T handler, int flag)
-/*
- bit0= set to default handlers
- bit1= set to ignore
- bit2= set cleanup_perform_app_handler_first
- bit3= set SIGABRT to handler (makes sense with bits 0 or 1)
-*/
-{
- int i,j,max_sig= -1,min_sig= 0x7fffffff;
- sighandler_t sig_handler;
-
- cleanup_msg[0]= 0;
- cleanup_app_handle= handle;
- cleanup_app_handler= handler;
- if(flag&4)
-   cleanup_perform_app_handler_first= 1;
- if(flag&1)
-   sig_handler= SIG_DFL;
- else if(flag&2)
-   sig_handler= SIG_IGN;
- else
-   sig_handler= Cleanup_handler_generic;
- /* set all signal numbers between the lowest and highest in the list
-    except those in the non-signal list */
- for(i= 0; i<signal_list_count; i++) {
-   if(signal_list[i]>max_sig)
-     max_sig= signal_list[i];
-   if(signal_list[i]<min_sig)
-     min_sig= signal_list[i];
- }
- for(i= min_sig; i<=max_sig; i++) {
-   for(j= 0; j<non_signal_list_count; j++)
-     if(i==non_signal_list[j])
-   break;
-   if(j>=non_signal_list_count) {
-     if(i==SIGABRT && (flag&8))
-       signal(i,Cleanup_handler_generic);
-     else
-       signal(i,sig_handler);
-   }
- }
- return(1);
-}
-
-
-#endif /* ! Xorriso_cleanup_externaL */
-
-
 /* ------------------------------------------------------------------------ */
 /* DirseQ : crawl along a directory's content list */
 
@@ -2199,132 +1742,6 @@ return:
 }
 
 
-/* ------------------------------- TreeseQ -------------------------------- */
-/* DirseQ : crawl along a filesystem subtree */
-
-struct TreeseQ {
- char adr[SfileadrL];
- char path[SfileadrL];
- struct DirseQ *dir_stack;
- struct stat stbuf;
- int follow_links;
- int unused_yet;
-};
-
-
-int Treeseq_destroy(struct TreeseQ **o, int flag);
-
-
-/* @param flag bit0= follow symbolic links */
-int Treeseq_new(struct TreeseQ **o, char *adr, int flag)
-{
- int ret;
- struct TreeseQ *m;
-
- m= *o= TSOB_FELD(struct TreeseQ,1);
- if(m==NULL)
-   return(-1);
- m->adr[0]= 0;
- m->path[0]= 0;
- m->dir_stack= NULL;
- m->follow_links= (flag&1);
- m->unused_yet= 1;
- if(Sfile_str(m->adr, adr, 0)<=0)
-   {ret= 0; goto failed;}
- strcpy(m->path, adr);
- if(m->follow_links)
-   ret= stat(adr, &(m->stbuf));
- else
-   ret= lstat(adr, &(m->stbuf));
- if(ret==-1)
-   {ret= 0; goto failed;}
- if(S_ISDIR(m->stbuf.st_mode)) {
-   ret= Dirseq_new(&(m->dir_stack), adr, 0);
-   if(ret<=0)
-     goto failed;
- }
- return(1);
-failed:;
- Treeseq_destroy(o,0);
- return(ret);
-}
-
-
-int Treeseq_destroy(struct TreeseQ **o, int flag)
-{
- struct DirseQ *dirseq, *next;
-
- for(dirseq= (*o)->dir_stack; dirseq!=NULL; dirseq= next) {
-   next= dirseq->next;
-   Dirseq_destroy(&dirseq,0);
- }
- free((char *) *o);
- (*o)= NULL;
- return(1);
-}
-
-
-/* @return <0 error, 0= no more entries available, 1= ok, reply is valid
-*/
-int Treeseq_next(struct TreeseQ *o, char adr[SfileadrL], struct stat **stbuf,
-                 int flag)
-{
- int ret;
- char next_name[SfileadrL], *spt;
- struct DirseQ *next_dirseq;
-
- if(o->dir_stack==NULL) {
-   if(!o->unused_yet)
-     return(0);
-   strcpy(adr, o->adr);
-   *stbuf= &(o->stbuf);
-   o->unused_yet= 0;
-   return(1);
- }
- o->unused_yet= 0;
-next_in_dirseq:;
- ret= Dirseq_next_adr(o->dir_stack, next_name, 1);
- if(ret<0)
-   return(ret);
- if(ret>0) {
-   strcpy(adr, o->path);
-   ret= Sfile_add_to_path(adr, next_name, 0);
-   if(ret<=0)
-     return(-1);
-   if(o->follow_links)
-     ret= stat(adr, &(o->stbuf));
-   else
-     ret= lstat(adr, &(o->stbuf));
-   *stbuf= &(o->stbuf);
-
-   if(!S_ISDIR(o->stbuf.st_mode))
-     return(1);
-
-   /* Directory found: push new DirseQ on stack */
-   ret= Dirseq_new(&next_dirseq, adr, 0);
-   if(ret<=0)
-     return(-1);
-   Dirseq_set_next(next_dirseq, o->dir_stack, 0);
-   o->dir_stack= next_dirseq;
-   strcpy(o->path, adr);
-   return(1);
- }
-
- /* pop DirseQ from stack */
- Dirseq_get_next(o->dir_stack, &next_dirseq, 0);
- Dirseq_destroy(&(o->dir_stack), 0);
- o->dir_stack= next_dirseq;
- spt= strrchr(o->path, '/');
- if(spt!=NULL)
-   (*spt)= 0;
- else
-   o->path[0]= 0;
- if(o->dir_stack!=NULL)
-   goto next_in_dirseq;
- return(0); /* it is done */
-}
-
-
 /* ------------------------------ LinkiteM -------------------------------- */
 
 struct LinkiteM {
@@ -2450,12 +1867,12 @@ struct FindjoB {
    12= alter_date_r type date
    13= find
    14= compare disk_equivalent_of_start_path
-   15= in_iso
-   16= not_in_iso
-   17= update
-   18= add_missing
-   19= empty_iso_dir
-   20= is_full_in_iso
+   15= in_iso iso_rr_equivalent_of_start_path
+   16= not_in_iso iso_rr_equiv
+   17= update disk_equiv
+   18= add_missing iso_rr_equiv
+   19= empty_iso_dir iso_rr_equiv
+   20= is_full_in_iso iso_rr_equiv
  */
  int action;
  char *target;
@@ -3556,6 +2973,7 @@ int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
  return(1);
 }
 
+
 int Xorriso_reset_counters(struct XorrisO *xorriso, int flag)
 {
  xorriso->error_count= 0;
@@ -4453,8 +3871,6 @@ much_too_long:;
 }
 
 
-#define Xorriso_with_compare_2_contentS yes
-
 /*
    @param result  Bitfield indicationg type of mismatch
               bit11= cannot open regular disk file
@@ -4655,16 +4071,9 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
  struct SplitparT *split_parts= NULL;
  int split_count= 0;
 
-#ifdef Xorriso_with_compare_2_contentS
  char part_path[SfileadrL], *part_name;
  int partno, total_parts= 0;
  off_t offset, bytes, total_bytes;
-#else /* Xorriso_with_compare_2_contentS */
- void *stream2= NULL;
- int fd1= -1, wanted, r1, r2, done;
- off_t r1count= 0, r2count= 0, diffcount= 0, first_diff= -1;
- char buf1[32*1024], buf2[32*1024];
-#endif /* Xorriso_with_compare_2_contentS */
 
  *result= 0;
  respt= xorriso->result_line;
@@ -4801,9 +4210,6 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
    }
  }
  if(S_ISREG(s1.st_mode) && S_ISREG(s2.st_mode)) {
-
-#ifdef Xorriso_with_compare_2_contentS
-
    /* Content */
    if(is_split) { 
      for(i= 0; i<split_count; i++) {
@@ -4838,129 +4244,10 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
                         (s1.st_mtime==s2.st_mtime) | (flag&((1<<29)|(1<<31))));
    }
 
-#else /* Xorriso_with_compare_2_contentS */
-
-   fd1= open(disk_adr, O_RDONLY);
-   if(fd1==-1) {
-     sprintf(respt, "- %s (DISK) : cannot open() : %s\n",
-             disk_adr, strerror(errno));
-     if(!(flag&(1<<31)))
-       Xorriso_result(xorriso,0);
-     (*result)|= 2048;
-     {ret= 0; goto ex;}
-   }
-
-   ret= Xorriso_iso_file_open(xorriso, iso_adr, &stream2, 0);
-   if(ret<=0) {
-     sprintf(respt, "- %s  (ISO) : cannot open() file in ISO image\n",iso_adr);
-     if(!(flag&(1<<31)))
-       Xorriso_result(xorriso,0);
-     close(fd1);
-     fd1= -1;
-     (*result)|= 4096;
-     {ret= 0; goto ex;}
-   }
-
-   done= 0;
-   while(!done) {
-     /* fd1 is a regular file and should deliver full buffers */
-     r1= read(fd1, buf1, sizeof(buf1));
-
-     wanted= sizeof(buf2);
-
-/* ts A80228
-I thought to have seen a libisofs bug here but it seems that it was an illusion
-*/
-#define Libisofs_data_read_as_posiX yes
-#ifndef Libisofs_data_read_as_posiX
-     /* Workaround for the case that iso_stream_read() fails on
-        oversized read requests. */
-     if(r2count+wanted>s2.st_size)
-       wanted= s2.st_size-r2count;
-#endif
-
-     if(wanted>0)
-       r2= Xorriso_iso_file_read(xorriso, stream2, buf2, wanted, 0);
-     else
-       r2= 0;
-
-     if((r1==EOF && r2==EOF) || (r1==0 && r2==0))
-   break;
-     if(r1==EOF || r1==0) {
-       if(r1==EOF)
-         r1= 0;
-       if(s1.st_size > r1count + r1) {
-         sprintf(respt, "- %s (DISK) : early EOF after %.f bytes\n",
-                 disk_adr, (double) r1count);
-         if(!(flag&(1<<31)))
-           Xorriso_result(xorriso,0);
-         (*result)|= 8196;
-       }
-       (*result)|= (1<<15);
-     }
-     r1count+= r1;
-     if(r2==EOF || r2<r1) {
-       if(r2==EOF)
-         r2= 0;
-       if(s2.st_size > r2count + r2) {
-         sprintf(respt, "- %s  (ISO) : early EOF after %.f bytes\n",
-                 iso_adr, (double) r2count);
-         if(!(flag&(1<<31)))
-           Xorriso_result(xorriso,0);
-         (*result)|= (1<<14);
-       }
-       (*result)|= (1<<15);
-       done= 1;
-     }
-     if(r2>r1) {
-       if(s1.st_size > r1count + r1) {
-         sprintf(respt, "- %s (DISK) : early EOF after %.f bytes\n",
-                 disk_adr, (double) r1count);
-         if(!(flag&(1<<31)))
-           Xorriso_result(xorriso,0);
-         (*result)|= 8196;
-       }
-       (*result)|= (1<<15);
-       done= 1;
-     }
-     r2count+= r2;
-     if(r1>r2)
-       r1= r2;
-     for(i= 0; i<r1; i++) {
-       if(buf1[i]!=buf2[i]) {
-         if(first_diff<0)
-           first_diff= i;
-         diffcount++;
-       }
-     }
-     if(!(flag&(1<<29))) {
-       xorriso->pacifier_count+= r1;
-       Xorriso_pacifier_callback(xorriso, "content bytes read",
-                                 xorriso->pacifier_count, 0, "", 0);
-     }
-   }
-   if(diffcount>0 || r1count!=r2count) {
-     if(first_diff<0)
-       first_diff= (r1count>r2count ? r2count : r1count);
-     sprintf(respt, "%s %s  :  differs by at least %.f bytes. First at %.f\n",
-             a, (s1.st_mtime==s2.st_mtime ?  "CONTENT": "content"),
-             (double) (diffcount + abs(r1count-r2count)), (double) first_diff);
-     if(!(flag&(1<<31)))
-       Xorriso_result(xorriso,0);
-     (*result)|= (1<<15);
-   }
-
-#endif /* ! Xorriso_with_compare_2_contentS */
-
  }
 
  ret= (((*result)&~((1<<17)|(1<<18)))==0);
 ex:;
-#ifndef Xorriso_with_compare_2_contentS
- if(fd1!=-1)
-   close(fd1);
- Xorriso_iso_file_close(xorriso, &stream2, 0);
-#endif /* ! Xorriso_with_compare_2_contentS */
  if(split_parts!=NULL)
    Splitparts_destroy(&split_parts, split_count, 0);
  return(ret);
@@ -4994,6 +4281,9 @@ int Xorriso_find_compare(struct XorrisO *xorriso, void *boss_iter,
  if(ret<=0)
    return(ret);
 
+ /* >>> compare exclusions against disk_path resp. leaf name */;
+   /* >>> eventually return 3 */
+
  follow_links= (xorriso->do_follow_links ||
                (xorriso->do_follow_param && !(flag&2))) <<28;
  ret= Xorriso_compare_2_files(xorriso, disk_path, iso_path, adrc, &result,
@@ -6345,13 +5635,6 @@ int Xorriso_format_ls_l(struct XorrisO *xorriso, struct stat *stbuf, int flag)
  char *rpt, perms[10];
  mode_t st_mode;
 
-#ifdef NIX
- time_t mtime;
- struct tm tms, *tmpt;
- static char months[12][4]= { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-                              "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-#endif
-
  rpt= xorriso->result_line;
  rpt[0]= 0;
  st_mode= stbuf->st_mode;
@@ -6382,21 +5665,8 @@ int Xorriso_format_ls_l(struct XorrisO *xorriso, struct stat *stbuf, int flag)
  sprintf(rpt+strlen(rpt), "%-8lu ", (unsigned long) stbuf->st_gid);
  sprintf(rpt+strlen(rpt), "%8.f ", (double) stbuf->st_size);
 
-#ifndef NIX
  Ftimetxt(stbuf->st_mtime, rpt+strlen(rpt), 0);
  strcat(rpt, " ");
-#else
- mtime= stbuf->st_mtime;
- tmpt= localtime_r(&mtime, &tms);
- if(tmpt==0)
-   sprintf(rpt+strlen(rpt), "%12.f ",(double) mtime);
- else if(time(NULL)-mtime < 180*86400 && time(NULL)-mtime >= 0)
-   sprintf(rpt+strlen(rpt), "%3s %2d %2.2d:%2.2d ",
-           months[tms.tm_mon], tms.tm_mday, tms.tm_hour, tms.tm_min);
- else
-   sprintf(rpt+strlen(rpt), "%3s %2d  %4.4d ",
-           months[tms.tm_mon], tms.tm_mday, 1900+tms.tm_year);
-#endif
 
  return(1);
 }
@@ -6735,6 +6005,9 @@ int Xorriso_findx(struct XorrisO *xorriso, struct FindjoB *job,
    if(ret<=0)
      goto ex;
    abs_dir_path= abs_dir_path_data;
+
+   /* >>> compare exclusions against abs_path resp. leaf name */;
+
    ret= lstat(abs_dir_path, dir_stbuf);
    if(ret==-1)
      {ret= 0; goto ex;}
@@ -6794,6 +6067,9 @@ int Xorriso_findx(struct XorrisO *xorriso, struct FindjoB *job,
    ret= Xorriso_make_abs_adr(xorriso, dir_path, name, path, 4);
    if(ret<=0)
      goto ex;
+
+   /* >>> compare exclusions against abs_path resp. leaf name */;
+
    ret= lstat(abs_path, &stbuf);
    if(ret==-1)
  continue;
@@ -7437,24 +6713,6 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
      ret= Sfile_type(adr+6, 1);
      if(ret==-1) {
        /* ok */;
-
-#ifdef NIX
-     } else if(ret==1) {
-
-       /* <<< is now done in libisoburn by bit4 of Xorriso_option_dev() */
-
-       ret= truncate(adr+6, (off_t) 0);
-       if(ret==-1) {
-         sprintf(xorriso->info_text, "-as %s: Cannot truncate existing -o %s",
-                 whom, Text_shellsafe(adr+6, sfe, 0));
-         Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE",
-                             0);
-       }
-       sprintf(xorriso->info_text, "-as %s: Truncated existing -o %s",
-               whom, Text_shellsafe(adr+6, sfe, 0));
-       Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
-#endif /* NIX */
-
      } else if(ret==2 || ret==3) {
        sprintf(xorriso->info_text,
                "-as %s: Cannot accept %s as target: -o %s",
@@ -7637,14 +6895,6 @@ int Xorriso_update_interpreter(struct XorrisO *xorriso, void *boss_iter,
  xorriso->info_text[0]= 0;
  is_split= !!(compare_result & (1<<17));
 
- /* <<< */
- if(0 && is_split) {
-   sprintf(xorriso->info_text, "Split file cannot be updated yet: %s\n",
-           Text_shellsafe(iso_rr_path, sfe, 0));
-   Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 1);
-   {ret= 1; goto ex;}
- }
-
  if(compare_result&(8|64)) {
    /* file type, minor+major with device file */
    ret= Xorriso_rmi(xorriso, boss_iter, (off_t) 0, iso_rr_path, 1); /* rm_r */
@@ -7874,14 +7124,6 @@ int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
      }
      *wpt= 0;
    }
-
-/* <<< do not apply wdx to both, but wdi to ISO and wdx to disk
-   if(source[0]!='/') {
-     ret= Sfile_prepend_path(xorriso->wdx, source, 0);
-     if(ret<=0)
-       goto problem_handler;
-   }
-*/
    if(split==0) {
      strcpy(target, source);
    } else if(target[0]!='/') {
@@ -8069,11 +7311,7 @@ int Xorriso_option_ban_stdio_write(struct XorrisO *xorriso, int flag)
 int Xorriso_option_blank(struct XorrisO *xorriso, char *mode, int flag)
 {
  char drive_name[SfileadrL], *cmd= "-blank";
-#ifndef NIX
  int aq_ret;
-#else
- sfe[5*SfileadrL];
-#endif
  int ret, aq_flag= 2, mode_flag;
 
  if(flag&1)
@@ -8122,9 +7360,6 @@ int Xorriso_option_blank(struct XorrisO *xorriso, char *mode, int flag)
    return(ret);
  strcpy(drive_name, xorriso->outdev);
  if(ret!=2) {
-
-#ifndef NIX
-
    if(ret<=0)
      aq_flag= 0;
    aq_ret= Xorriso_reaquire_outdev(xorriso, aq_flag);
@@ -8132,29 +7367,6 @@ int Xorriso_option_blank(struct XorrisO *xorriso, char *mode, int flag)
      return(ret);
    if(aq_ret<=0)
      return(aq_ret);
-
-#else
-
-   Xorriso_give_up_drive(xorriso, aq_flag);
-   if(ret<=0) {    /* this is the return value of the blank|format function */
-     sprintf(xorriso->info_text,"Gave up -outdev %s",
-             Text_shellsafe(xorriso->outdev, sfe, 0));
-     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
-     return(ret);
-   }
-   sprintf(xorriso->info_text,"Re-aquiring -outdev %s",
-           Text_shellsafe(drive_name, sfe, 0));
-   Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
-   ret= Xorriso_aquire_drive(xorriso, drive_name, aq_flag); 
-   if(ret<=0) {
-     sprintf(xorriso->info_text,"Could not re-aquire -outdev %s",
-             Text_shellsafe(xorriso->outdev, sfe, 0));
-     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
-     return(ret);
-   }
-
-#endif /* NIX */
-
  }
  return(1);
 }
@@ -10165,7 +9377,7 @@ int Xorriso_option_page(struct XorrisO *xorriso, int len, int width, int flag)
 int Xorriso_option_path_list(struct XorrisO *xorriso, char *adr, int flag)
 {
  int ret,linecount= 0, insertcount= 0, null= 0, was_failure= 0, fret= 0;
- int was_ferror= 0, list_errfile= 0;
+ int was_ferror= 0;
  FILE *fp= NULL;
  char *argpt, sfe[5*SfileadrL],line[SfileadrL];
  
@@ -10185,18 +9397,6 @@ int Xorriso_option_path_list(struct XorrisO *xorriso, char *adr, int flag)
        was_ferror= 1;
  break;
    }
-
-   /* <<< disabled for now: list all files which get not processed after
-          the problem evaluator decided to abort. Actually the whole program
-          will abort and thus further commands will not report their omitted
-          files.
-   */
-   if(list_errfile) {
-     if(line[0])
-       Xorriso_msgs_submit(xorriso, 0, line, 0, "ERRFILE", 0);
- continue;
-   }
-
    linecount++;
    if(line[0]==0)
  continue;
@@ -10213,25 +9413,19 @@ problem_handler:;
    fret= Xorriso_eval_problem_status(xorriso, ret, 1|2);
    if(fret>=0)
  continue;
-
-#ifdef NIX
-   list_errfile= 1; /* <<< disabled : see above */
-#else
    goto ex;
-#endif
-
  }
  ret= 1;
 ex:;
  Xorriso_pacifier_callback(xorriso, "files added", xorriso->pacifier_count,
                            xorriso->pacifier_total, "", 1);
- if(ret<=0 || list_errfile) {
+ if(ret<=0) {
    sprintf(xorriso->info_text, "Aborted reading of file %s in line number %d",
            Text_shellsafe(adr, sfe, 0), linecount);
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0,
                        (fret==-2 ? "NOTE" : "FAILURE"), 0);
  }
- ret= !(was_ferror || list_errfile);
+ ret= !was_ferror;
  sprintf(xorriso->info_text, "Added %d items from file %s\n",
          insertcount, Text_shellsafe(adr, sfe, 0));
  Xorriso_info(xorriso,0);
@@ -11331,36 +10525,7 @@ next_command:;
    ret= Xorriso_option_temp_mem_limit(xorriso, arg1, 0);
 
  } else if(strcmp(cmd,"test")==0) { /* This option does not exist. */
-   char line[4096];
-   struct TreeseQ *seq;
-   struct stat *stbufpt;
-
-   printf("XORRISO: -test : enter a file address for tree crawling\n");
-   ret= Xorriso_dialog_input(xorriso,line,sizeof(line),4);
-   if(ret<=0)
-     goto eval_any_problems;
-   ret= Treeseq_new(&seq, line, 0);
-   if(ret<=0) {
-     sprintf(xorriso->info_text,"Failed to create TreeseQ");
-     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
-     goto eval_any_problems;
-   }
-   while(1) {
-     ret= Treeseq_next(seq, line, &stbufpt, 0);
-     if(ret<=0)
-   break;
-     sprintf(xorriso->result_line,"%s%s\n",line,
-             S_ISDIR(stbufpt->st_mode) ? "/" : "");
-     Xorriso_result(xorriso,0);
-     if(xorriso->request_to_abort)
-   break;
-   }
-   Treeseq_destroy(&seq, 0);
-   if(ret<0) {
-     sprintf(xorriso->info_text,"Tree crawling aborted");
-     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
-     goto eval_any_problems;
-   }
+   ;
 
  } else if(strcmp(cmd,"toc")==0) {
    Xorriso_option_toc(xorriso, 0);
@@ -11579,14 +10744,6 @@ int Xorriso_prescan_args(struct XorrisO *xorriso, int argc, char **argv,
        Xorriso_option_help(xorriso,0);
        xorriso->did_something_useful= 1;
        return(0);
-
-#ifdef NIX
-     } else if(strcmp(cmd,"version")==0) {
-       Xorriso_option_version(xorriso, 0);
-       xorriso->did_something_useful= 1;
-       return(0);
-#endif
-
      }
    } else if(i==1 && strcmp(cmd,"no_rc")==0) {
      ret= Xorriso_option_no_rc(xorriso, 0);
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 3a25b196..3660f5e4 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.04.07.185727"
+#define Xorriso_timestamP "2008.04.07.201253"
diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c
index ef34ea63..c192225d 100644
--- a/xorriso/xorrisoburn.c
+++ b/xorriso/xorrisoburn.c
@@ -1586,7 +1586,7 @@ cannot_open_dir:;
    Linkitem_reset_stack(&own_link_stack, link_stack, 0);
    srcpt= disk_path;
    Xorriso_process_msg_queues(xorriso,0);
-   ret= Dirseq_next_adr(dirseq,name,0);
+   ret= Dirseq_next_adr(dirseq,name,0); /* name is a pointer into disk_path */
    if(ret==0)
  break;
    if(ret<0) {
@@ -1594,6 +1594,9 @@ cannot_open_dir:;
      Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FATAL", 0);
      {ret= -1; goto ex;}
    }
+
+   /* >>> compare exclusions against disk_path resp. name */;
+
    strcpy(img_name, name);
    if(Xorriso_much_too_long(xorriso, strlen(img_path), 0)<=0)
      {ret= 0; goto was_problem;}
@@ -1800,23 +1803,8 @@ int Xorriso_copy_implict_properties(struct XorrisO *xorriso, IsoDir *dir,
    strcpy(nfd, "/");
  if(stat(nfd, &stbuf)==-1)
    return(0);
-
-#ifdef NIX
- if((flag&1) && d==0) {
-   /* give directory x-permission where is r-permission */
-   if(stbuf.st_mode&S_IRUSR)
-     stbuf.st_mode|= S_IXUSR;
-   if(stbuf.st_mode&S_IRGRP)
-     stbuf.st_mode|= S_IXGRP;
-   if(stbuf.st_mode&S_IROTH)
-     stbuf.st_mode|= S_IXOTH;
- }
- Xorriso_transfer_properties(xorriso, &stbuf, (IsoNode *) dir, flag&1);
-#else
  Xorriso_transfer_properties(xorriso, &stbuf, (IsoNode *) dir,
                              ((flag&1) && d==0));
-#endif /* ! NIX */
-
  sprintf(xorriso->info_text,
          "Copied properties for %s", Text_shellsafe(ni, sfe, 0));
  sprintf(xorriso->info_text+strlen(xorriso->info_text),
@@ -1869,11 +1857,12 @@ int Xorriso_graft_in(struct XorrisO *xorriso, void *boss_iter,
  int target_is_split;
  struct stat stbuf;
 
+
+ /* >>> compare exclusions against disk_path resp. name 
+        but no leaf patter if flag&4 */;
+
+
  for(cpt= img_path; 1; cpt++) {
-/*
-   if(cpt[0]!='/')
- break;
-*/
    cpt= strstr(cpt,"/.");
    if(cpt==NULL)
  break;
@@ -3592,6 +3581,7 @@ ex:;
  return(ret);
 }
 
+
 /* @param boss_iter Opaque handle to be forwarded to actions in ISO image
                     Set to NULL if calling this function from outside ISO world
 */