From 7b1c3b8460be18f519077f8b900c438040d01cfd Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sun, 14 Dec 2008 15:16:09 +0000
Subject: [PATCH] Removed outdated alternative code

---
 libisoburn/trunk/xorriso/xorriso.c           | 48 --------------------
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c
index 7135a0d0..db079a54 100644
--- a/libisoburn/trunk/xorriso/xorriso.c
+++ b/libisoburn/trunk/xorriso/xorriso.c
@@ -9357,25 +9357,6 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
  char sfe[5*SfileadrL], adr[SfileadrL+8], ra_text[80], pathspec[2*SfileadrL];
  char *ept, *add_pt, eff_path[SfileadrL], indev[SfileadrL+8], msc[80], *cpt;
 
-#ifdef Xorriso_old_genisofs_ignorE
- int idx_offset= 0, k;
-
- /* mkisofs 2.01 options which are not scheduled for implementation, yet */
- static char ignored_arg0_options[][41]= {
-   "-allow-leading-dots", "-ldots", "-allow-lowercase", "-allow-multidot",
-   "-cache-inodes", "-no-cache-inodes", "-check-oldnames", "-d", "-D",
-   "-joliet-long", "-l", "-L", "-max-iso9660-filenames", "-N", "-nobak",
-   "-no-bak", "-force-rr", "-r", "-relaxed-filenames", "-T", "-U",
-   "-no-iso-translate",
-   ""
- };
- static char ignored_arg1_options[][41]= {
-   "-A", "-biblio", "-check-session", "-p", "-root",
-   "-old-root", "-sysid", "-table-name", 
-   ""
- };
-#endif /* Xorriso_old_genisofs_ignorE */
-
  static char helptext[][80]= {
 "Usage: xorriso -as mkisofs [options] file...",
 "Note: This is not mkisofs. See xorriso -help, xorriso -version, man xorriso",
@@ -9417,13 +9398,9 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
 
  adr[0]= indev[0]= msc[0]= 0;
  for(i= 0; i<argc; i++) {
-#ifndef Xorriso_old_genisofs_ignorE
-
    ret= Xorriso_genisofs_ignore(xorriso, whom, argv, &i, 1);
    if(ret == 1)
  continue;
-
-#endif /*  Xorriso_old_genisofs_ignorE */
    if(strcmp(argv[i], "-version")==0) {
      sprintf(xorriso->result_line,
 "mkisofs 2.01-Emulation Copyright (C) 2008 see libburnia-project.org xorriso\n"
@@ -9623,34 +9600,9 @@ illegal_c:;
    sprintf(xorriso->info_text, "-as %s: %s",
            whom, Text_shellsafe(argv[i], sfe, 0));
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0);
-
-#ifdef Xorriso_old_genisofs_ignorE
-   idx_offset= 0;
-   for(k=0;ignored_arg0_options[k][0]!=0;k++)
-     if(strcmp(argv[i],ignored_arg0_options[k])==0)
-       goto no_volunteer;
-   for(k=0;ignored_arg1_options[k][0]!=0;k++)
-     if(strcmp(argv[i],ignored_arg1_options[k])==0) {
-       i++;
-       idx_offset= -1;
-       goto no_volunteer;
-     }
-   if(0) {
-no_volunteer:;
-     sprintf(xorriso->info_text, "-as %s: Ignored option %s",
-             whom, Text_shellsafe(argv[i+idx_offset], sfe, 0));
-     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
- continue;
-   }
-
-#else /* Xorriso_old_genisofs_ignorE */
-
    ret= Xorriso_genisofs_ignore(xorriso, whom, argv, &i, 0);
    if(ret == 1)
  continue;
-
-#endif /* ! Xorriso_old_genisofs_ignorE */
-
    if(strcmp(argv[i], "-version")==0) {
      /* was already handled in first argument scan */;
 
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 07eff8e0..19e2cefb 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.12.14.093125"
+#define Xorriso_timestamP "2008.12.14.151550"