Load /tmp/tmp.iJANi30786/cdck-0.6.0 into

cdck/branches/upstream/current.

diff --git a/ChangeLog b/ChangeLog
index 54662813d572dd4ad81ef177a1b14683fea3fc47..e577e9a88ac1a38ef2e42add165ad0759bba1cbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 # $RCSfile: ChangeLog,v $
 # $Author: swaj $
-# $Revision: 1.4 $
+# $Revision: 1.5 $
 
 Copyright by Alexey Semenoff (c) 2005-2006.
        
@@ -9,6 +9,10 @@ modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
 of the License, or (at your option) any later version.
 
+0.6.0
+       Signed char patch for arm, powerpc, and s390 was merged into main
+       source tree. More verbose information about ISO9660 disks.
+
 0.5.2
        A few cleanups as well as some typos were corrected.
 

diff --git a/configure b/configure
index bd0a1c92b8d5f15f5cb4bb14e23a43a05f5e1708..1989b89a9fa3255bbce185f24a0dd98c82c14e86 100755 (executable)
--- a/configure
+++ b/configure
@@ -1785,7 +1785,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=cdck
- VERSION=0.5.2
+ VERSION=0.6.0
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index 4083a1a30b16b7f1aa0862546fac10c69f6ceba7..cb992d93b39a944a82db65856d190fc0c19a27b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl $RCSfile: configure.ac,v $
 dnl $Author: swaj $
-dnl $Revision: 1.7 $  
+dnl $Revision: 1.8 $  
 
 AC_INIT
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(cdck, 0.5.2)
+AM_INIT_AUTOMAKE(cdck, 0.6.0)
 
 S_CFLAGS=${CFLAGS}
 

diff --git a/src/cdck b/src/cdck
index 21ac97e9a2a67bd4baf077337e0395097feecfed..201d22eac8a2a7296939aa6084af5483ddc28aaa 100755 (executable)
Binary files a/src/cdck and b/src/cdck differ

diff --git a/src/cdck_main.cpp b/src/cdck_main.cpp
index cf1c0934273c10cd5be1991bec79219c1753497b..0e5e3f2cdab9c441f5fa410f9fd4bca5730d0855 100644 (file)
--- a/src/cdck_main.cpp
+++ b/src/cdck_main.cpp
@@ -1,7 +1,7 @@
 /*
  * $RCSfile: cdck_main.cpp,v $
  * $Author: swaj $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -21,7 +21,7 @@
 
 int main (int argc, char *argv[])
 {
-       char ch;
+       signed char ch;
        char *program_name = (strchr(argv[0], '/') == NULL) ? argv[0] : (strrchr(argv[0], '/') + 1);
 
        bool verbose = false;

diff --git a/src/config.h b/src/config.h
index ad9d7ad326306a918817954998ed6f4ff2416aab..99148d6d16590e6eab0677595bd9a9db777d5d64 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -65,7 +65,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.5.2"
+#define VERSION "0.6.0"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #define _FILE_OFFSET_BITS 64

diff --git a/src/lib_cdinfo.cpp b/src/lib_cdinfo.cpp
index c7679b9e3ce72b00fa63f4ce5f4c6bca02884b6f..d9deebe9a380eb0ab3b9c691524b4035fe44fc82 100644 (file)
--- a/src/lib_cdinfo.cpp
+++ b/src/lib_cdinfo.cpp
@@ -1,7 +1,7 @@
 /*
  * $RCSfile: lib_cdinfo.cpp,v $
  * $Author: swaj $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  */
 
 /*
@@ -33,6 +33,46 @@
 #include "lib_cdinfo.h"
 #include "lib_main.h"
 
+static 
+void cannibalize_buffer (char *buff)
+{
+       int len = strlen(buff);
+
+       if (!len)
+               return;
+
+       int i;
+       for (i=len-1; i>0; i--)
+       {
+               switch (buff[i]) {
+               case 0x20:
+                       buff[i] = 0x0;
+                       break;
+               default:
+                       return;
+               }
+       }
+}
+
+void Ccdrom::read_creation_data (void)
+{
+       memset (buffer6, 0, 2048);
+       memset (sbuffer, 0, 256);
+       memset (sbuffer2, 0, 256);
+       memset (sbuffer3, 0, 256);
+
+       lseek (fd, 2048*16, SEEK_SET);
+       read (fd, buffer6, 2048);
+
+       memcpy (sbuffer,  buffer6 + PUBLISHER_OFFSET, PUBLISHER_LEN);
+       memcpy (sbuffer2, buffer6 + PREPARER_OFFSET , PREPARER_LEN);
+       memcpy (sbuffer3, buffer6 + SOFTWARE_OFFSET, SOFTWARE_LEN);
+
+       cannibalize_buffer (sbuffer);
+       cannibalize_buffer (sbuffer2);
+       cannibalize_buffer (sbuffer3);
+}
+
 void Ccdrom::read_super(int offset)
 {
     /* sector 16, super block */
@@ -63,6 +103,7 @@ void Ccdrom::read_super4(int offset)
     memset(buffer4,0,2048);
     lseek(fd,2048*(offset+17),SEEK_SET);
     read(fd,buffer4,2048);
+    read_creation_data();
 }
 
 void Ccdrom::read_super5(int offset)
@@ -247,3 +288,9 @@ int Ccdrom::guess_filesystem(int start_session)
 /*
  * __END__
  */
+
+
+
+
+
+

diff --git a/src/lib_cdinfo.h b/src/lib_cdinfo.h
index d840b36fabb4f4dbec8fcb34aa3ff690add9f01f..3833ec9f994a83c1c5cb2cdfe6fb277bfa706c57 100644 (file)
--- a/src/lib_cdinfo.h
+++ b/src/lib_cdinfo.h
@@ -1,7 +1,7 @@
 /*
  * $RCSfile: lib_cdinfo.h,v $
  * $Author: swaj $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  */
 
 /*
@@ -34,6 +34,18 @@
 #define VIDEOCDI                    1024
 
 
+
+#define PUBLISHER_OFFSET 0x13e
+#define PUBLISHER_LEN 0x7f
+
+#define PREPARER_OFFSET 0x1be
+#define PREPARER_LEN 0x7f
+
+#define SOFTWARE_OFFSET 0x23e
+#define SOFTWARE_LEN 0xef
+
+
+
 #endif /* __LIB_CDINFO_H_ */
 
 

diff --git a/src/lib_main.cpp b/src/lib_main.cpp
index 9c52152e04e3d058b9e2ccbb0afdad26252c9b87..256a62aa9906fd12b3a9aa8a3f380403ec180c02 100644 (file)
--- a/src/lib_main.cpp
+++ b/src/lib_main.cpp
@@ -1,7 +1,7 @@
 /*
  * $RCSfile: lib_main.cpp,v $
  * $Author: swaj $
- * $Revision: 1.8 $
+ * $Revision: 1.10 $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -347,11 +347,23 @@ int Ccdrom::ReadTOC()
        }
 
        switch(fs & FS_MASK) {
+       case FS_ISO_HFS:
+#define PRINT_ISO9660 printf("iso9660: %i MB size, label '%.32s'\n", isofs_size/512,buffer+40);
+               PRINT_ISO9660;
+               break;
+
        case FS_ISO_9660:
        case FS_ISO_9660_INTERACTIVE:
-       case FS_ISO_HFS:
-               printf("iso9660: %i MB size, label >%.32s<\n",
-                      isofs_size/512,buffer+40);
+               PRINT_ISO9660;
+               if (strlen(sbuffer3)>1)
+                       printf ("Creating software: '%.80s'\n", sbuffer3);
+
+               if (strlen(sbuffer)>1)
+                       printf ("Publisher: '%.80s'\n", sbuffer);
+
+               if (strlen(sbuffer2)>1)
+                       printf ("Preparer: '%.80s'\n", sbuffer2);
+
                break;
        }
 

diff --git a/src/lib_main.h b/src/lib_main.h
index a0fe4ca87b71193b76cbefd9c3ea325e38238613..4f47c8de9253bacf5f6ace65131208bbae415a2a 100644 (file)
--- a/src/lib_main.h
+++ b/src/lib_main.h
@@ -1,7 +1,7 @@
 /*
  * $RCSfile: lib_main.h,v $
  * $Author: swaj $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  */
 
 
@@ -26,6 +26,7 @@ class Ccdrom {
 
        const char * Error(void);
        int ReadTOC();
+
        void EnableInfo(bool a_enable_info);
 
        int OpenPlotFile (const char *plotfile = DEFAULT_PLOT_FILE);
@@ -60,6 +61,10 @@ class Ccdrom {
        void read_super3(int offset);
        void read_super4(int offset);
        void read_super5(int offset);
+
+       void read_creation_data (void);
+
+
        int is_isofs(void);
        int is_hs(void);
        int is_cdi(void);
@@ -81,6 +86,11 @@ class Ccdrom {
        char buffer3[2048];
        char buffer4[2048];
        char buffer5[2048];
+       char buffer6[2048];
+
+       char sbuffer[256];
+       char sbuffer2[256];
+       char sbuffer3[256];
 
        int isofs_size;
 };