qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 15:35:30 +02:00
Code

more devfs related bugs

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6543 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2007-03-09 18:39:34 +00:00
parent e7bcfad835
commit 2d335117cf
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
target/linux/brcm-2.4/src/jffs2root.c
View File

@ -33,8 +33,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "mtd.h" #include "mtd.h"
#define FILENAME "/dev/mtdblock/1"
struct trx_header { struct trx_header {
unsigned magic; /* "HDR0" */ unsigned magic; /* "HDR0" */
unsigned len; /* Length of file including header */ unsigned len; /* Length of file including header */
@ -78,18 +76,25 @@ int main(int argc, char **argv)
struct trx_header *ptr; struct trx_header *ptr;
char *buf; char *buf;
if (((fd = open(FILENAME, O_RDWR)) < 0) if ((fd = open("/dev/mtdblock/1", O_RDWR)) < 0) {
|| ((len = lseek(fd, 0, SEEK_END)) < 0) fd = open("/dev/mtdblock1", O_RDWR);
}
if (((len = lseek(fd, 0, SEEK_END)) < 0)
|| ((ptr = (struct trx_header *) mmap(0, len, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1)) || ((ptr = (struct trx_header *) mmap(0, len, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1))
|| (ptr->magic != 0x30524448)) { || (ptr->magic != 0x30524448)) {
printf("Error reading trx info\n"); printf("Error reading trx info\n");
exit(-1); exit(-1);
} }
close (fd);
if (((fd = open("/dev/mtd/1", O_RDWR)) < 0) close(fd);
|| (ioctl(fd, MEMGETINFO, &mtdInfo))) {
fprintf(stderr, "Could not get MTD device info from %s\n", FILENAME); if ((fd = open("/dev/mtd/1", O_RDWR)) < 0) {
fd = open("/dev/mtd1", O_RDWR);
}
if (ioctl(fd, MEMGETINFO, &mtdInfo)) {
fprintf(stderr, "Could not get MTD device info from mtd\n");
close(fd); close(fd);
exit(1); exit(1);
} }