[prev in list] [next in list] [prev in thread] [next in thread] 

List:       klik-devel
Subject:    [klik-devel] [klikclient commit] r1686 -
From:       codesite-noreply () google ! com
Date:       2008-08-29 17:02:03
Message-ID: 0016362835ea74ca3004559c36e6 () google ! com
[Download RAW message or body]

Author: cristian.debian
Date: Fri Aug 29 10:01:43 2008
New Revision: 1686

Modified:
    branches/cristian/fusioniso/fusioniso/src/fusioniso_fs.c
    branches/cristian/fusioniso/fusioniso/src/fusioniso_fs.h

Log:
Fix lionel's changes to use new data->glibc var instead of extern_glibc, and
also fix a cut&paste error on line 1088 (v_count instead of total_size).


Modified: branches/cristian/fusioniso/fusioniso/src/fusioniso_fs.c
==============================================================================
--- branches/cristian/fusioniso/fusioniso/src/fusioniso_fs.c	(original)
+++ branches/cristian/fusioniso/fusioniso/src/fusioniso_fs.c	Fri Aug 29  
10:01:43 2008
@@ -85,6 +85,7 @@
  #include <fcntl.h>
  #include <dirent.h>
  #include <libgen.h>
+#include <elf.h>

  #ifdef HAVE_SETXATTR
  #include <sys/xattr.h>
@@ -972,7 +973,7 @@
              lseek(v_file, offset, SEEK_SET);
              v_count = read(v_file, out_buf, size);
              close(v_file);
-            if (extern_glibc && offset==0 && v_count>18 && memcmp(out_buf,  
ELFMAG, SELFMAG)==0 && out_buf[16]==ET_EXEC)
+            if (data->glibc && offset==0 && v_count>18 && memcmp(out_buf,  
ELFMAG, SELFMAG)==0 && out_buf[16]==ET_EXEC)
              {
                  fs_rewrite_loader(out_buf, v_count);
              }
@@ -987,7 +988,7 @@
              lseek(v_file, offset, SEEK_SET);
              v_count = read(v_file, out_buf, size);
              close(v_file);
-            if (extern_glibc && offset==0 && v_count>18 && memcmp(out_buf,  
ELFMAG, SELFMAG)==0 && out_buf[16]==ET_EXEC)
+            if (data->glibc && offset==0 && v_count>18 && memcmp(out_buf,  
ELFMAG, SELFMAG)==0 && out_buf[16]==ET_EXEC)
              {
                  fs_rewrite_loader(out_buf, v_count);
              }
@@ -1016,7 +1017,7 @@
  	if (v_count<0)
  		return -EINVAL;

-        if (extern_glibc && offset==0 && v_count>18 && memcmp(out_buf,  
ELFMAG, SELFMAG)==0 && out_buf[16]==ET_EXEC)
+        if (data->glibc && offset==0 && v_count>18 && memcmp(out_buf,  
ELFMAG, SELFMAG)==0 && out_buf[16]==ET_EXEC)
          {
              fs_rewrite_loader(out_buf, v_count);
          }
@@ -1084,7 +1085,7 @@
      }

      free(buf);
-    if (extern_glibc && offset==0 && v_count>18 && memcmp(out_buf, ELFMAG,  
SELFMAG)==0 && out_buf[16]==ET_EXEC)
+    if (data->glibc && offset==0 && total_size>18 && memcmp(out_buf,  
ELFMAG, SELFMAG)==0 && out_buf[16]==ET_EXEC)
      {
          fs_rewrite_loader(out_buf, total_size);
      }

Modified: branches/cristian/fusioniso/fusioniso/src/fusioniso_fs.h
==============================================================================
--- branches/cristian/fusioniso/fusioniso/src/fusioniso_fs.h	(original)
+++ branches/cristian/fusioniso/fusioniso/src/fusioniso_fs.h	Fri Aug 29  
10:01:43 2008
@@ -33,7 +33,6 @@
  #include <sys/stat.h>
  #include <sys/statfs.h> // fix fs_real_statfs and include sys/statvfs.h
  #include <sys/types.h>
-#include <elf.h>

  #define PAGE_CACHE_SIZE (4096)  // unused

_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]