Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-06-12 03:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Use ext2_fs.h from e2fslibs-dev package"

Browse Source 
This reverts commit e1afe443ed.
This commit is contained in:
Laurent Vivier 2014-05-11 00:24:51 +02:00
parent 204bf1d146
commit ac237764b2
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/control vendored
View File

@ -3,8 +3,8 @@ Section: admin
Priority: optional Priority: optional
Maintainer: Wouter Verhelst <wouter@debian.org> Maintainer: Wouter Verhelst <wouter@debian.org>
Uploaders: Wouter Verhelst <wouter@debian.org>, Stephen R. Marenka <smarenka@debian.org> Uploaders: Wouter Verhelst <wouter@debian.org>, Stephen R. Marenka <smarenka@debian.org>
Build-Depends: debhelper (>> 4.1.16), docbook-to-man, gcc, e2fslibs-dev Build-Depends: debhelper (>> 4.1.16), docbook-to-man, gcc-3.3 | gcc-3.4 | gcc-4.1 | gcc-4.4
Build-Depends-Indep: gcc-4.6-m68k-linux-gnu [!m68k] Build-Depends-Indep: gcc-3.4-m68k-linux [!m68k] | m68k-linux-gcc [!m68k] | gcc-3.4-m68k-linux-gnu [!m68k] | gcc-4.1-m68k-linux-gnu [!m68k]
Standards-Version: 3.7.2 Standards-Version: 3.7.2
Package: emile-bootblocks Package: emile-bootblocks

2
libext2/ext2.h
View File

@ -9,7 +9,7 @@
#include <unistd.h> #include <unistd.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <ext2fs/ext2_fs.h> #include <linux/ext2_fs.h>
#include <libstream.h> #include <libstream.h>

11
libext2/ext2_utils.c
View File

@ -24,9 +24,9 @@ void ext2_get_super(device_io_t *device, struct ext2_super_block *super)
super->s_free_inodes_count = __le32_to_cpu(super->s_free_inodes_count); super->s_free_inodes_count = __le32_to_cpu(super->s_free_inodes_count);
super->s_first_data_block = __le32_to_cpu(super->s_first_data_block); super->s_first_data_block = __le32_to_cpu(super->s_first_data_block);
super->s_log_block_size = __le32_to_cpu(super->s_log_block_size); super->s_log_block_size = __le32_to_cpu(super->s_log_block_size);
super->s_log_cluster_size = __le32_to_cpu(super->s_log_cluster_size); super->s_log_frag_size = __le32_to_cpu(super->s_log_frag_size);
super->s_blocks_per_group = __le32_to_cpu(super->s_blocks_per_group); super->s_blocks_per_group = __le32_to_cpu(super->s_blocks_per_group);
super->s_clusters_per_group = __le32_to_cpu(super->s_clusters_per_group); super->s_frags_per_group = __le32_to_cpu(super->s_frags_per_group);
super->s_inodes_per_group = __le32_to_cpu(super->s_inodes_per_group); super->s_inodes_per_group = __le32_to_cpu(super->s_inodes_per_group);
super->s_mtime = __le32_to_cpu(super->s_mtime); super->s_mtime = __le32_to_cpu(super->s_mtime);
super->s_wtime = __le32_to_cpu(super->s_wtime); super->s_wtime = __le32_to_cpu(super->s_wtime);
@ -150,15 +150,12 @@ int ext2_get_inode(ext2_VOLUME* volume,
inode->i_file_acl = __le32_to_cpu(le_inode->i_file_acl); inode->i_file_acl = __le32_to_cpu(le_inode->i_file_acl);
inode->i_dir_acl = __le32_to_cpu(le_inode->i_dir_acl); inode->i_dir_acl = __le32_to_cpu(le_inode->i_dir_acl);
inode->i_faddr = __le32_to_cpu(le_inode->i_faddr); inode->i_faddr = __le32_to_cpu(le_inode->i_faddr);
inode->osd2.linux2.l_i_blocks_hi = inode->osd2.linux2.l_i_frag = le_inode->osd2.linux2.l_i_frag;
__le16_to_cpu(le_inode->osd2.linux2.l_i_blocks_hi); inode->osd2.linux2.l_i_fsize = le_inode->osd2.linux2.l_i_fsize;
inode->osd2.linux2.l_i_file_acl_high =
__le16_to_cpu(le_inode->osd2.linux2.l_i_file_acl_high);
inode->osd2.linux2.l_i_uid_high = inode->osd2.linux2.l_i_uid_high =
__le16_to_cpu(le_inode->osd2.linux2.l_i_uid_high); __le16_to_cpu(le_inode->osd2.linux2.l_i_uid_high);
inode->osd2.linux2.l_i_gid_high = inode->osd2.linux2.l_i_gid_high =
__le16_to_cpu(le_inode->osd2.linux2.l_i_gid_high); __le16_to_cpu(le_inode->osd2.linux2.l_i_gid_high);
return 0; return 0;
} }

2
libext2/ext2_utils.h
View File

@ -8,7 +8,7 @@
#define __EXT2_UTILS_H__ #define __EXT2_UTILS_H__
#include <linux/fs.h> #include <linux/fs.h>
#include <ext2fs/ext2_fs.h> #include <linux/ext2_fs.h>
#include <libstream.h> #include <libstream.h>
#include "ext2.h" #include "ext2.h"

2
tools/ext2_ls.c
View File

@ -16,7 +16,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <ext2fs/ext2_fs.h> #include <linux/ext2_fs.h>
#include <libext2.h> #include <libext2.h>
#include "device.h" #include "device.h"