Unnamed

Only in cromfs-1.2.5.patched: .depend
diff -u cromfs-1.2.5/Makefile cromfs-1.2.5.patched/Makefile
--- cromfs-1.2.5/Makefile       Wed Feb 14 11:51:02 2007
+++ cromfs-1.2.5.patched/Makefile       Sat Apr 14 16:58:58 2007
@@ -110,7 +110,7 @@

 OBJS=cromfs.o cromfs-ops.o main.o

-LDLIBS += -lfuse
+LDLIBS += -lfuse -L/usr/local/lib -lpthread

 DEPFUN_INSTALL=ignore

@@ -129,7 +129,7 @@
        $(CXX) $(CXXFLAGS) -o $@ $(OBJS) $(LDLIBS)

 cromfs-driver-static: $(OBJS)
-       $(CXX) -static $(CXXFLAGS) -o $@ $(OBJS) $(LDLIBS) -lpthread -lrt
+       $(CXX) -static $(CXXFLAGS) -o $@ $(OBJS) $(LDLIBS) -lpthread
        - strip -R.comment $@
        # Note: It does not matter if upx cannot run.
        - upx --best $@
@@ -138,17 +138,17 @@
 #      $(CC) -o $@ $^ -fomit-frame-pointer -c

 util/mkcromfs: FORCE
-       make -C util mkcromfs
+       gmake -C util mkcromfs

 util/unmkcromfs: FORCE
-       make -C util unmkcromfs
+       gmake -C util unmkcromfs

 util/cvcromfs: FORCE
-       make -C util cvcromfs
+       gmake -C util cvcromfs

 clean:
        rm -rf $(OBJS) $(PROGS) install
-       make -C util clean
+       gmake -C util clean

 install: $(PROGS) FORCE
        - mkdir install install/progs install/docs
diff -u cromfs-1.2.5/cromfs-ops.cc cromfs-1.2.5.patched/cromfs-ops.cc
--- cromfs-1.2.5/cromfs-ops.cc  Wed Feb 14 13:26:25 2007
+++ cromfs-1.2.5.patched/cromfs-ops.cc  Sat Apr 14 00:57:15 2007
@@ -55,10 +55,10 @@
         cromfs* fs = NULL;
         try
         {
-            if(isatty(fd))
-            {
-                throw EBADFD;
-            }
+//            if(isatty(fd))
+//            {
+//               throw EBADFD;
+//            }
             fs = new cromfs(fd);
         }
         /*catch(char){}*/
diff -u cromfs-1.2.5/cromfs.cc cromfs-1.2.5.patched/cromfs.cc
--- cromfs-1.2.5/cromfs.cc      Wed Feb 14 13:09:57 2007
+++ cromfs-1.2.5.patched/cromfs.cc      Sat Apr 14 00:55:14 2007
@@ -137,7 +137,7 @@
 void cromfs::reread_superblock()
 {
     char Buf[64];
-    if(pread64(fd, Buf, sizeof(Buf), 0) == -1) throw errno;
+    if(pread(fd, Buf, sizeof(Buf), 0) == -1) throw errno;

     uint_fast64_t sig  = R64(Buf+0x0000);
     if(sig != CROMFS_SIGNATURE_01
@@ -209,7 +209,7 @@
     for(;;)
     {
         unsigned char Buf[4];
-        ssize_t r = pread64(fd, Buf, 4, startpos);
+        ssize_t r = pread(fd, Buf, 4, startpos);
         if(r == 0) break;
         if(r < 0) throw errno;
         if(r < 4) throw EINVAL;
@@ -280,7 +280,7 @@
 {
     std::vector<unsigned char> blktab_compressed(sblock.blktab_size);

-    ssize_t r = pread64(fd, &blktab_compressed[0], blktab_compressed.size(), sblock.blktab_offs);
+    ssize_t r = pread(fd, &blktab_compressed[0], blktab_compressed.size(), sblock.blktab_offs);
     if(r != (ssize_t)blktab_compressed.size())
     {
         throw EINVAL;
@@ -343,7 +343,7 @@
                 throw EIO;
             }
             std::vector<unsigned char> Buf(size);
-            if(pread64(fd, &Buf[0], size, offset+0) == -1) throw errno;
+            if(pread(fd, &Buf[0], size, offset+0) == -1) throw errno;
             Buf = LZMADeCompress(&Buf[0], size);

             ExtractInodeHeader(inode, &Buf[0]);
@@ -372,7 +372,7 @@
         {
             unsigned char Buf[0x18];

-            if(pread64(fd, Buf, 0x18, offset+0) == -1) throw errno;
+            if(pread(fd, Buf, 0x18, offset+0) == -1) throw errno;

             ExtractInodeHeader(inode, Buf);

@@ -384,7 +384,7 @@
             uint_fast64_t nblocks = CalcSizeInBlocks(inode.bytesize);
             inode.blocklist.resize(nblocks);

-            if(pread64(fd, &inode.blocklist[0], 4 * nblocks, offset+0x18) == -1) throw errno;
+            if(pread(fd, &inode.blocklist[0], 4 * nblocks, offset+0x18) == -1) throw errno;

             /* Fix endianess after raw read */
             for(unsigned n=0; n<nblocks; ++n)
@@ -502,7 +502,7 @@
     uint_fast64_t filepos_ignore = fblktab[ind].filepos - filepos_aligned_down;
     size_t map_size = comp_size + filepos_ignore;

-    void* map_buf = mmap64(NULL, map_size, PROT_READ, MAP_SHARED, fd, filepos_aligned_down);
+    void* map_buf = mmap(NULL, map_size, PROT_READ, MAP_SHARED, fd, filepos_aligned_down);
     if(map_buf != (void*)-1)
     {
         const unsigned char* Buf = filepos_ignore + (unsigned char*)map_buf;
@@ -525,7 +525,7 @@

     std::vector<unsigned char> Buf(comp_size);

-    ssize_t r = pread64(fd, &Buf[0], comp_size, fblktab[ind].filepos);
+    ssize_t r = pread(fd, &Buf[0], comp_size, fblktab[ind].filepos);
 #if FBLOCK_DEBUG
     fprintf(stderr, "- - - - reading fblock %u (%u bytes) from %llu: got %ld\n",
         (unsigned)ind, (unsigned)comp_size, fblktab[ind].filepos, (long)r);
Common subdirectories: cromfs-1.2.5/doc and cromfs-1.2.5.patched/doc
Common subdirectories: cromfs-1.2.5/tests and cromfs-1.2.5.patched/tests
Common subdirectories: cromfs-1.2.5/util and cromfs-1.2.5.patched/util