summaryrefslogtreecommitdiffstats
path: root/rbutil/ipodpatcher
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-12-23 23:30:57 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2013-01-01 15:05:52 +0100
commit24e37ddf57bac6a1c9786d50abbe3a1982930382 (patch)
treeb34ae751986f185f51556a040f388025cac4c383 /rbutil/ipodpatcher
parent6803d7b10cd9651ded08674f1597d4511cabb7af (diff)
downloadrockbox-24e37ddf57bac6a1c9786d50abbe3a1982930382.tar.gz
rockbox-24e37ddf57bac6a1c9786d50abbe3a1982930382.tar.bz2
rockbox-24e37ddf57bac6a1c9786d50abbe3a1982930382.zip
ipodpatcher: move sectorbuf pointer into ipod_t structure.
The ipod_t structure holds all relevant information for ipodpatcher. Put the global ipod_sectorbuf pointer into it as well. Allows the Rockbox Utility Ipod class to be instanciated multiple times since each instance can now have its own buffer. Change-Id: Ie319cbadbc20c367ceadba9a46b4dc34b57a79a7
Diffstat (limited to 'rbutil/ipodpatcher')
-rw-r--r--rbutil/ipodpatcher/fat32format.c19
-rw-r--r--rbutil/ipodpatcher/ipodio-posix.c20
-rw-r--r--rbutil/ipodpatcher/ipodio-win32.c20
-rw-r--r--rbutil/ipodpatcher/ipodio.h7
-rw-r--r--rbutil/ipodpatcher/ipodpatcher.c262
-rw-r--r--rbutil/ipodpatcher/ipodpatcher.h10
-rw-r--r--rbutil/ipodpatcher/main.c2
7 files changed, 196 insertions, 144 deletions
diff --git a/rbutil/ipodpatcher/fat32format.c b/rbutil/ipodpatcher/fat32format.c
index 9d2c538cd7..f47be60a97 100644
--- a/rbutil/ipodpatcher/fat32format.c
+++ b/rbutil/ipodpatcher/fat32format.c
@@ -87,9 +87,6 @@ static uint32_t rb_htole32(uint32_t x)
}
-/* A large aligned buffer for disk I/O */
-extern unsigned char* ipod_sectorbuf;
-
/* TODO: Pass these as parameters to the various create_ functions */
/* can be zero for default or 1,2,4,8,16,32 or 64 */
@@ -166,7 +163,7 @@ static int zero_sectors(struct ipod_t* ipod, uint64_t sector, int count)
return -1;
}
- memset(ipod_sectorbuf, 0, 128 * ipod->sector_size);
+ memset(ipod->sectorbuf, 0, 128 * ipod->sector_size);
/* Write 128 sectors at a time */
while (count) {
@@ -175,7 +172,7 @@ static int zero_sectors(struct ipod_t* ipod, uint64_t sector, int count)
else
n = count;
- if (ipod_write(ipod,ipod_sectorbuf,n * ipod->sector_size) < 0) {
+ if (ipod_write(ipod,n * ipod->sector_size) < 0) {
perror("[ERR] Write failed in zero_sectors\n");
return -1;
}
@@ -484,15 +481,15 @@ int format_partition(struct ipod_t* ipod, int partition)
fprintf(stderr,"[INFO] Initialising reserved sectors and FATs...\n" );
/* Create the boot sector structure */
- create_boot_sector(ipod_sectorbuf, ipod, partition);
- create_fsinfo(ipod_sectorbuf + 512);
+ create_boot_sector(ipod->sectorbuf, ipod, partition);
+ create_fsinfo(ipod->sectorbuf + 512);
/* Write boot sector and fsinfo at start of partition */
if (ipod_seek(ipod, ipod->pinfo[partition].start * ipod->sector_size) < 0) {
fprintf(stderr,"[ERR] Seek failed\n");
return -1;
}
- if (ipod_write(ipod,ipod_sectorbuf,512 * 2) < 0) {
+ if (ipod_write(ipod,512 * 2) < 0) {
perror("[ERR] Write failed (first copy of bootsect/fsinfo)\n");
return -1;
}
@@ -502,13 +499,13 @@ int format_partition(struct ipod_t* ipod, int partition)
fprintf(stderr,"[ERR] Seek failed\n");
return -1;
}
- if (ipod_write(ipod,ipod_sectorbuf,512 * 2) < 0) {
+ if (ipod_write(ipod,512 * 2) < 0) {
perror("[ERR] Write failed (first copy of bootsect/fsinfo)\n");
return -1;
}
/* Create the first FAT sector */
- create_firstfatsector(ipod_sectorbuf);
+ create_firstfatsector(ipod->sectorbuf);
/* Write the first fat sector in the right places */
for ( i=0; i<NumFATs; i++ ) {
@@ -519,7 +516,7 @@ int format_partition(struct ipod_t* ipod, int partition)
return -1;
}
- if (ipod_write(ipod,ipod_sectorbuf,512) < 0) {
+ if (ipod_write(ipod,512) < 0) {
perror("[ERR] Write failed (first copy of bootsect/fsinfo)\n");
return -1;
}
diff --git a/rbutil/ipodpatcher/ipodio-posix.c b/rbutil/ipodpatcher/ipodio-posix.c
index 8d43de2d60..377510912a 100644
--- a/rbutil/ipodpatcher/ipodio-posix.c
+++ b/rbutil/ipodpatcher/ipodio-posix.c
@@ -358,10 +358,10 @@ int ipod_close(struct ipod_t* ipod)
return 0;
}
-int ipod_alloc_buffer(unsigned char** sectorbuf, int bufsize)
+int ipod_alloc_buffer(struct ipod_t* ipod, int bufsize)
{
- *sectorbuf=malloc(bufsize);
- if (*sectorbuf == NULL) {
+ ipod->sectorbuf = malloc(bufsize);
+ if (ipod->sectorbuf== NULL) {
return -1;
}
return 0;
@@ -379,14 +379,20 @@ int ipod_seek(struct ipod_t* ipod, unsigned long pos)
return 0;
}
-ssize_t ipod_read(struct ipod_t* ipod, unsigned char* buf, int nbytes)
+ssize_t ipod_read(struct ipod_t* ipod, int nbytes)
{
- return read(ipod->dh, buf, nbytes);
+ if(ipod->sectorbuf == NULL) {
+ return -1;
+ }
+ return read(ipod->dh, ipod->sectorbuf, nbytes);
}
-ssize_t ipod_write(struct ipod_t* ipod, unsigned char* buf, int nbytes)
+ssize_t ipod_write(struct ipod_t* ipod, int nbytes)
{
- return write(ipod->dh, buf, nbytes);
+ if(ipod->sectorbuf == NULL) {
+ return -1;
+ }
+ return write(ipod->dh, ipod->sectorbuf, nbytes);
}
#endif
diff --git a/rbutil/ipodpatcher/ipodio-win32.c b/rbutil/ipodpatcher/ipodio-win32.c
index 27c1b24f01..d4bdbf0173 100644
--- a/rbutil/ipodpatcher/ipodio-win32.c
+++ b/rbutil/ipodpatcher/ipodio-win32.c
@@ -158,12 +158,12 @@ int ipod_close(struct ipod_t* ipod)
return 0;
}
-int ipod_alloc_buffer(unsigned char** sectorbuf, int bufsize)
+int ipod_alloc_buffer(struct ipod_t* ipod, int bufsize)
{
/* The ReadFile function requires a memory buffer aligned to a multiple of
the disk sector size. */
- *sectorbuf = (unsigned char*)VirtualAlloc(NULL, bufsize, MEM_COMMIT, PAGE_READWRITE);
- if (*sectorbuf == NULL) {
+ ipod->sectorbuf = (unsigned char*)VirtualAlloc(NULL, bufsize, MEM_COMMIT, PAGE_READWRITE);
+ if (ipod->sectorbuf== NULL) {
ipod_print_error(" Error allocating a buffer: ");
return -1;
}
@@ -179,11 +179,14 @@ int ipod_seek(struct ipod_t* ipod, unsigned long pos)
return 0;
}
-ssize_t ipod_read(struct ipod_t* ipod, unsigned char* buf, int nbytes)
+ssize_t ipod_read(struct ipod_t* ipod, int nbytes)
{
unsigned long count;
- if (!ReadFile(ipod->dh, buf, nbytes, &count, NULL)) {
+ if(ipod->sectorbuf == NULL) {
+ return -1;
+ }
+ if (!ReadFile(ipod->dh, ipod->sectorbuf, nbytes, &count, NULL)) {
ipod_print_error(" Error reading from disk: ");
return -1;
}
@@ -191,11 +194,14 @@ ssize_t ipod_read(struct ipod_t* ipod, unsigned char* buf, int nbytes)
return count;
}
-ssize_t ipod_write(struct ipod_t* ipod, unsigned char* buf, int nbytes)
+ssize_t ipod_write(struct ipod_t* ipod, int nbytes)
{
unsigned long count;
- if (!WriteFile(ipod->dh, buf, nbytes, &count, NULL)) {
+ if(ipod->sectorbuf == NULL) {
+ return -1;
+ }
+ if (!WriteFile(ipod->dh, ipod->sectorbuf, nbytes, &count, NULL)) {
ipod_print_error(" Error writing to disk: ");
return -1;
}
diff --git a/rbutil/ipodpatcher/ipodio.h b/rbutil/ipodpatcher/ipodio.h
index e08d74a785..8a2f06cf20 100644
--- a/rbutil/ipodpatcher/ipodio.h
+++ b/rbutil/ipodpatcher/ipodio.h
@@ -70,6 +70,7 @@ struct partinfo_t {
};
struct ipod_t {
+ unsigned char* sectorbuf;
HANDLE dh;
char diskname[4096];
int sector_size;
@@ -103,9 +104,9 @@ int ipod_close(struct ipod_t* ipod);
int ipod_seek(struct ipod_t* ipod, unsigned long pos);
int ipod_scsi_inquiry(struct ipod_t* ipod, int page_code,
unsigned char* buf, int bufsize);
-ssize_t ipod_read(struct ipod_t* ipod, unsigned char* buf, int nbytes);
-ssize_t ipod_write(struct ipod_t* ipod, unsigned char* buf, int nbytes);
-int ipod_alloc_buffer(unsigned char** sectorbuf, int bufsize);
+ssize_t ipod_read(struct ipod_t* ipod, int nbytes);
+ssize_t ipod_write(struct ipod_t* ipod, int nbytes);
+int ipod_alloc_buffer(struct ipod_t* ipod, int bufsize);
/* In fat32format.c */
int format_partition(struct ipod_t* ipod, int partition);
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c
index 542e078605..55f501dc6c 100644
--- a/rbutil/ipodpatcher/ipodpatcher.c
+++ b/rbutil/ipodpatcher/ipodpatcher.c
@@ -51,7 +51,6 @@
int ipod_verbose = 0;
-unsigned char* ipod_sectorbuf = NULL;
/* The following string appears at the start of the firmware partition */
static const char *apple_stop_sign = "{{~~ /-----\\ "\
@@ -172,7 +171,12 @@ int read_partinfo(struct ipod_t* ipod, int silent)
int i;
unsigned long count;
- count = ipod_read(ipod,ipod_sectorbuf, ipod->sector_size);
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
+
+ count = ipod_read(ipod,ipod->sector_size);
if (count <= 0) {
ipod_print_error(" Error reading from disk: ");
@@ -181,12 +185,12 @@ int read_partinfo(struct ipod_t* ipod, int silent)
memset(ipod->pinfo, 0, sizeof(ipod->pinfo));
- if ((ipod_sectorbuf[510] == 0x55) && (ipod_sectorbuf[511] == 0xaa)) {
+ if ((ipod->sectorbuf[510] == 0x55) && (ipod->sectorbuf[511] == 0xaa)) {
/* DOS partition table */
ipod->macpod = 0;
/* parse partitions */
for ( i = 0; i < 4; i++ ) {
- unsigned char* ptr = ipod_sectorbuf + 0x1be + 16*i;
+ unsigned char* ptr = ipod->sectorbuf + 0x1be + 16*i;
ipod->pinfo[i].type = ptr[4];
ipod->pinfo[i].start = BYTES2INT32(ptr, 8);
ipod->pinfo[i].size = BYTES2INT32(ptr, 12);
@@ -196,7 +200,7 @@ int read_partinfo(struct ipod_t* ipod, int silent)
/* not handled yet */
}
}
- } else if ((ipod_sectorbuf[0] == 'E') && (ipod_sectorbuf[1] == 'R')) {
+ } else if ((ipod->sectorbuf[0] == 'E') && (ipod->sectorbuf[1] == 'R')) {
/* Apple Partition Map */
/* APM parsing code based on the check_mac_partitions() function in
@@ -205,7 +209,7 @@ int read_partinfo(struct ipod_t* ipod, int silent)
int blkNo = 1;
int partBlkCount = 1;
- int partBlkSizMul = ipod_sectorbuf[2] / 2;
+ int partBlkSizMul = ipod->sectorbuf[2] / 2;
int pmMapBlkCnt; /* # of blks in partition map */
int pmPyPartStart; /* physical start blk of partition */
@@ -222,7 +226,7 @@ int read_partinfo(struct ipod_t* ipod, int silent)
return -1;
}
- count = ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ count = ipod_read(ipod, ipod->sector_size);
if (count <= 0) {
ipod_print_error(" Error reading from disk: ");
@@ -230,26 +234,26 @@ int read_partinfo(struct ipod_t* ipod, int silent)
}
/* see if it's a partition entry */
- if ((ipod_sectorbuf[0] != 'P') || (ipod_sectorbuf[1] != 'M')) {
+ if ((ipod->sectorbuf[0] != 'P') || (ipod->sectorbuf[1] != 'M')) {
/* end of partition table -> leave the loop */
break;
}
/* Extract the interesting entries */
- pmMapBlkCnt = be2int(ipod_sectorbuf + 4);
- pmPyPartStart = be2int(ipod_sectorbuf + 8);
- pmPartBlkCnt = be2int(ipod_sectorbuf + 12);
+ pmMapBlkCnt = be2int(ipod->sectorbuf + 4);
+ pmPyPartStart = be2int(ipod->sectorbuf + 8);
+ pmPartBlkCnt = be2int(ipod->sectorbuf + 12);
/* update the number of part map blocks */
partBlkCount = pmMapBlkCnt;
- if (strncmp((char*)(ipod_sectorbuf + 48), "Apple_MDFW", 32)==0) {
+ if (strncmp((char*)(ipod->sectorbuf + 48), "Apple_MDFW", 32)==0) {
/* A Firmware partition */
ipod->pinfo[i].start = pmPyPartStart;
ipod->pinfo[i].size = pmPartBlkCnt;
ipod->pinfo[i].type = 0;
i++;
- } else if (strncmp((char*)(ipod_sectorbuf + 48), "Apple_HFS", 32)==0) {
+ } else if (strncmp((char*)(ipod->sectorbuf + 48), "Apple_HFS", 32)==0) {
/* A HFS partition */
ipod->pinfo[i].start = pmPyPartStart;
ipod->pinfo[i].size = pmPartBlkCnt;
@@ -290,6 +294,10 @@ int read_partition(struct ipod_t* ipod, int outfile)
if (ipod_seek(ipod, ipod->start) < 0) {
return -1;
}
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
fprintf(stderr,"[INFO] Writing %d sectors to output file\n",count);
@@ -301,7 +309,7 @@ int read_partition(struct ipod_t* ipod, int outfile)
chunksize = bytesleft;
}
- n = ipod_read(ipod, ipod_sectorbuf, chunksize);
+ n = ipod_read(ipod, chunksize);
if (n < 0) {
return -1;
@@ -316,7 +324,7 @@ int read_partition(struct ipod_t* ipod, int outfile)
bytesleft -= n;
- res = write(outfile,ipod_sectorbuf,n);
+ res = write(outfile,ipod->sectorbuf,n);
if (res < 0) {
perror("[ERR] write in disk_read");
@@ -346,12 +354,16 @@ int write_partition(struct ipod_t* ipod, int infile)
if (ipod_seek(ipod, ipod->start) < 0) {
return -1;
}
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
fprintf(stderr,"[INFO] Writing input file to device\n");
bytesread = 0;
eof = 0;
while (!eof) {
- n = read(infile,ipod_sectorbuf,BUFFER_SIZE);
+ n = read(infile,ipod->sectorbuf,BUFFER_SIZE);
if (n < 0) {
perror("[ERR] read in disk_write");
@@ -369,7 +381,7 @@ int write_partition(struct ipod_t* ipod, int infile)
bytesread += n;
- res = ipod_write(ipod, ipod_sectorbuf, n);
+ res = ipod_write(ipod, n);
if (res < 0) {
ipod_print_error(" Error writing to disk: ");
@@ -437,7 +449,7 @@ int diskmove(struct ipod_t* ipod, int delta)
return -1;
}
- if ((n = ipod_read(ipod,ipod_sectorbuf,chunksize)) < 0) {
+ if ((n = ipod_read(ipod,chunksize)) < 0) {
perror("[ERR] Write failed\n");
return -1;
}
@@ -453,7 +465,7 @@ int diskmove(struct ipod_t* ipod, int delta)
return -1;
}
- if ((n = ipod_write(ipod,ipod_sectorbuf,chunksize)) < 0) {
+ if ((n = ipod_write(ipod,chunksize)) < 0) {
perror("[ERR] Write failed\n");
return -1;
}
@@ -482,19 +494,23 @@ static int rename_image(struct ipod_t* ipod, char* from, char* to)
/* diroffset may not be sector-aligned */
x = ipod->diroffset % ipod->sector_size;
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
/* Read directory */
if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) {
fprintf(stderr,"[ERR] Seek to diroffset (%08x) failed.\n",(unsigned)ipod->diroffset);
return -1;
}
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) {
fprintf(stderr,"[ERR] Read of directory failed.\n");
return -1;
}
- p = ipod_sectorbuf + x;
+ p = ipod->sectorbuf + x;
/* A hack to detect 2nd gen Nanos - maybe there is a better way? */
if (p[0] == 0)
@@ -502,12 +518,12 @@ static int rename_image(struct ipod_t* ipod, char* from, char* to)
/* Adjust diroffset */
ipod->diroffset += ipod->sector_size - x;
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) {
fprintf(stderr,"[ERR] Read of directory failed.\n");
return -1;
}
- p = ipod_sectorbuf;
+ p = ipod->sectorbuf;
}
found = 0;
@@ -531,7 +547,7 @@ static int rename_image(struct ipod_t* ipod, char* from, char* to)
return -1;
}
- n=ipod_write(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_write(ipod, ipod->sector_size);
if (n < 0) {
fprintf(stderr,"[ERR] Write of directory failed in rename_image.\n");
return -1;
@@ -557,13 +573,13 @@ static int delete_image(struct ipod_t* ipod, char* name)
return -1;
}
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) {
fprintf(stderr,"[ERR] Read of directory failed.\n");
return -1;
}
- p = ipod_sectorbuf + x;
+ p = ipod->sectorbuf + x;
/* A hack to detect 2nd gen Nanos - maybe there is a better way? */
if (p[0] == 0)
@@ -571,12 +587,12 @@ static int delete_image(struct ipod_t* ipod, char* name)
/* Adjust diroffset */
ipod->diroffset += ipod->sector_size - x;
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) {
fprintf(stderr,"[ERR] Read of directory failed.\n");
return -1;
}
- p = ipod_sectorbuf;
+ p = ipod->sectorbuf;
}
found = 0;
@@ -599,7 +615,7 @@ static int delete_image(struct ipod_t* ipod, char* name)
return -1;
}
- n=ipod_write(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_write(ipod, ipod->sector_size);
if (n < 0) {
fprintf(stderr,"[ERR] Write of directory failed in delete_image.\n");
return -1;
@@ -623,6 +639,10 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
unsigned char header[8]; /* Header for .ipod file */
unsigned char* p;
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
#ifdef WITH_BOOTOBJS
if (type == FILETYPE_INTERNAL) {
fprintf(stderr,"[INFO] Using internal bootloader - %d bytes\n",ipod->bootloader_len);
@@ -677,14 +697,14 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
#ifdef WITH_BOOTOBJS
if (type == FILETYPE_INTERNAL) {
- memcpy(ipod_sectorbuf,ipod->bootloader,ipod->bootloader_len);
+ memcpy(ipod->sectorbuf,ipod->bootloader,ipod->bootloader_len);
}
else
#endif
{
fprintf(stderr,"[INFO] Reading input file...\n");
- n = read(infile,ipod_sectorbuf,length);
+ n = read(infile,ipod->sectorbuf,length);
if (n < 0) {
fprintf(stderr,"[ERR] Couldn't read input file\n");
close(infile);
@@ -694,13 +714,13 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
}
/* Pad the data with zeros */
- memset(ipod_sectorbuf+length,0,newsize-length);
+ memset(ipod->sectorbuf+length,0,newsize-length);
if (type==FILETYPE_DOT_IPOD) {
chksum = ipod->modelnum;
for (i = 0; i < length; i++) {
/* add 8 unsigned bits but keep a 32 bit sum */
- chksum += ipod_sectorbuf[i];
+ chksum += ipod->sectorbuf[i];
}
if (chksum == filechksum) {
@@ -725,7 +745,7 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
return -1;
}
- if ((n = ipod_write(ipod,ipod_sectorbuf,newsize)) < 0) {
+ if ((n = ipod_write(ipod,newsize)) < 0) {
perror("[ERR] Write failed\n");
return -1;
}
@@ -748,7 +768,7 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
chksum = 0;
for (i = 0; i < length; i++) {
/* add 8 unsigned bits but keep a 32 bit sum */
- chksum += ipod_sectorbuf[i];
+ chksum += ipod->sectorbuf[i];
}
x = ipod->diroffset % ipod->sector_size;
@@ -756,13 +776,13 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
/* Read directory */
if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { return -1; }
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) { return -1; }
/* Create a new directory entry */
/* Copy OSOS or OSBK details - we assume one of them exists */
- p = ipod_sectorbuf + x;
+ p = ipod->sectorbuf + x;
found = 0;
for (i = 0; !found && i < ipod->nimages; i++) {
if ((memcmp(p + 4, "soso", 4)==0) || (memcmp(p + 4, "kbso", 4)==0)) {
@@ -778,8 +798,8 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
}
/* Copy directory image */
- memcpy(ipod_sectorbuf + x + (ipod->nimages * 40), p, 40);
- p = ipod_sectorbuf + x + (ipod->nimages * 40);
+ memcpy(ipod->sectorbuf + x + (ipod->nimages * 40), p, 40);
+ p = ipod->sectorbuf + x + (ipod->nimages * 40);
/* Modify directory. */
memcpy(p + 4, imagename, 4);
@@ -789,7 +809,7 @@ int add_new_image(struct ipod_t* ipod, char* imagename, char* filename, int type
/* Write directory */
if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { return -1; }
- n=ipod_write(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_write(ipod, ipod->sector_size);
if (n < 0) { return -1; }
return 0;
@@ -895,6 +915,10 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
if (ipod->modelnum == 62) {
return add_bootloader_nano2g(ipod, filename, type);
}
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
/* Calculate the position in the OSOS image where our bootloader will go. */
if (ipod->ipod_directory[0].entryOffset>0) {
@@ -907,7 +931,7 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
#ifdef WITH_BOOTOBJS
if (type == FILETYPE_INTERNAL) {
fprintf(stderr,"[INFO] Using internal bootloader - %d bytes\n",ipod->bootloader_len);
- memcpy(ipod_sectorbuf+entryOffset,ipod->bootloader,ipod->bootloader_len);
+ memcpy(ipod->sectorbuf+entryOffset,ipod->bootloader,ipod->bootloader_len);
length = ipod->bootloader_len;
paddedlength=(ipod->bootloader_len+ipod->sector_size-1)&~(ipod->sector_size-1);
}
@@ -1005,14 +1029,14 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
/* We have moved the partitions, now we can write our bootloader */
- /* Firstly read the original firmware into ipod_sectorbuf */
+ /* Firstly read the original firmware into ipod->sectorbuf */
fprintf(stderr,"[INFO] Reading original firmware...\n");
if (ipod_seek(ipod, ipod->fwoffset+ipod->ipod_directory[0].devOffset) < 0) {
fprintf(stderr,"[ERR] Seek failed\n");
return -1;
}
- if ((n = ipod_read(ipod,ipod_sectorbuf,entryOffset)) < 0) {
+ if ((n = ipod_read(ipod,entryOffset)) < 0) {
perror("[ERR] Read failed\n");
return -1;
}
@@ -1025,19 +1049,19 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
#ifdef WITH_BOOTOBJS
if (type == FILETYPE_INTERNAL) {
- memcpy(ipod_sectorbuf+entryOffset,ipod->bootloader,ipod->bootloader_len);
+ memcpy(ipod->sectorbuf+entryOffset,ipod->bootloader,ipod->bootloader_len);
}
else
#endif
{
- memcpy(ipod_sectorbuf+entryOffset,bootloader_buf,length);
+ memcpy(ipod->sectorbuf+entryOffset,bootloader_buf,length);
free(bootloader_buf);
}
/* Calculate new checksum for combined image */
chksum = 0;
for (i=0;i<entryOffset + length; i++) {
- chksum += ipod_sectorbuf[i];
+ chksum += ipod->sectorbuf[i];
}
/* Now write the combined firmware image to the disk */
@@ -1047,7 +1071,7 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
return -1;
}
- if ((n = ipod_write(ipod,ipod_sectorbuf,entryOffset+paddedlength)) < 0) {
+ if ((n = ipod_write(ipod,entryOffset+paddedlength)) < 0) {
perror("[ERR] Write failed\n");
return -1;
}
@@ -1068,22 +1092,22 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
return -1;
}
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) {
fprintf(stderr,"[ERR] Directory read failed\n");
return -1;
}
/* Update entries for image 0 */
- int2le(entryOffset+length,ipod_sectorbuf+x+16);
- int2le(entryOffset,ipod_sectorbuf+x+24);
- int2le(chksum,ipod_sectorbuf+x+28);
- int2le(0xffffffff,ipod_sectorbuf+x+36); /* loadAddr */
+ int2le(entryOffset+length,ipod->sectorbuf+x+16);
+ int2le(entryOffset,ipod->sectorbuf+x+24);
+ int2le(chksum,ipod->sectorbuf+x+28);
+ int2le(0xffffffff,ipod->sectorbuf+x+36); /* loadAddr */
/* Update devOffset entries for other images, if we have moved them */
if (delta > 0) {
for (i=1;i<ipod->nimages;i++) {
- int2le(le2int(ipod_sectorbuf+x+i*40+12)+delta,ipod_sectorbuf+x+i*40+12);
+ int2le(le2int(ipod->sectorbuf+x+i*40+12)+delta,ipod->sectorbuf+x+i*40+12);
}
}
@@ -1092,7 +1116,7 @@ int add_bootloader(struct ipod_t* ipod, char* filename, int type)
fprintf(stderr,"[ERR] Seek to %d failed\n", (int)(ipod->start+ipod->diroffset-x));
return -1;
}
- n=ipod_write(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_write(ipod, ipod->sector_size);
if (n < 0) {
fprintf(stderr,"[ERR] Directory write failed\n");
return -1;
@@ -1113,6 +1137,10 @@ int delete_bootloader(struct ipod_t* ipod)
if (ipod->modelnum == 62) {
return delete_bootloader_nano2g(ipod);
}
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
/* Removing the bootloader involves adjusting the "length",
"chksum" and "entryOffset" values in the osos image's directory
@@ -1138,7 +1166,7 @@ int delete_bootloader(struct ipod_t* ipod)
fprintf(stderr,"[INFO] Padding read from 0x%08x to 0x%08x bytes\n",
length,i);
- if ((n = ipod_read(ipod,ipod_sectorbuf,i)) < 0) {
+ if ((n = ipod_read(ipod,i)) < 0) {
return -1;
}
@@ -1151,7 +1179,7 @@ int delete_bootloader(struct ipod_t* ipod)
chksum = 0;
for (i = 0; i < length; i++) {
/* add 8 unsigned bits but keep a 32 bit sum */
- chksum += ipod_sectorbuf[i];
+ chksum += ipod->sectorbuf[i];
}
/* Now write back the updated directory entry */
@@ -1163,17 +1191,17 @@ int delete_bootloader(struct ipod_t* ipod)
/* Read directory */
if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { return -1; }
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) { return -1; }
/* Update entries for image 0 */
- int2le(length,ipod_sectorbuf+x+16);
- int2le(0,ipod_sectorbuf+x+24);
- int2le(chksum,ipod_sectorbuf+x+28);
+ int2le(length,ipod->sectorbuf+x+16);
+ int2le(0,ipod->sectorbuf+x+24);
+ int2le(chksum,ipod->sectorbuf+x+28);
/* Write directory */
if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { return -1; }
- n=ipod_write(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_write(ipod, ipod->sector_size);
if (n < 0) { return -1; }
return 0;
@@ -1194,6 +1222,10 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
unsigned char header[8]; /* Header for .ipod file */
unsigned char* p;
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
#ifdef WITH_BOOTOBJS
if (type == FILETYPE_INTERNAL) {
fprintf(stderr,"[INFO] Using internal bootloader - %d bytes\n",ipod->bootloader_len);
@@ -1260,14 +1292,14 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
#ifdef WITH_BOOTOBJS
if (type == FILETYPE_INTERNAL) {
- memcpy(ipod_sectorbuf,ipod->bootloader,ipod->bootloader_len);
+ memcpy(ipod->sectorbuf,ipod->bootloader,ipod->bootloader_len);
}
else
#endif
{
fprintf(stderr,"[INFO] Reading input file...\n");
/* We now know we have enough space, so write it. */
- n = read(infile,ipod_sectorbuf,length);
+ n = read(infile,ipod->sectorbuf,length);
if (n < 0) {
fprintf(stderr,"[ERR] Couldn't read input file\n");
close(infile);
@@ -1277,13 +1309,13 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
}
/* Pad the data with zeros */
- memset(ipod_sectorbuf+length,0,newsize-length);
+ memset(ipod->sectorbuf+length,0,newsize-length);
if (type==FILETYPE_DOT_IPOD) {
chksum = ipod->modelnum;
for (i = 0; i < length; i++) {
/* add 8 unsigned bits but keep a 32 bit sum */
- chksum += ipod_sectorbuf[i];
+ chksum += ipod->sectorbuf[i];
}
if (chksum == filechksum) {
@@ -1315,7 +1347,7 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
return -1;
}
- if ((n = ipod_write(ipod,ipod_sectorbuf,newsize)) < 0) {
+ if ((n = ipod_write(ipod,newsize)) < 0) {
perror("[ERR] Write failed\n");
return -1;
}
@@ -1338,7 +1370,7 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
chksum = 0;
for (i = 0; i < length; i++) {
/* add 8 unsigned bits but keep a 32 bit sum */
- chksum += ipod_sectorbuf[i];
+ chksum += ipod->sectorbuf[i];
}
x = ipod->diroffset % ipod->sector_size;
@@ -1346,18 +1378,18 @@ int write_firmware(struct ipod_t* ipod, char* filename, int type)
/* Read directory */
if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { return -1; }
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) { return -1; }
/* Update entries for image */
- p = ipod_sectorbuf + x + (ipod->ososimage * 40);
+ p = ipod->sectorbuf + x + (ipod->ososimage * 40);
int2le(length - (ipod->modelnum==62 ? 0x800: 0), p + 16);
int2le(0, p + 24);
int2le(chksum, p + 28);
- /* Write directory */
+ /* Write directory */
if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { return -1; }
- n=ipod_write(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_write(ipod, ipod->sector_size);
if (n < 0) { return -1; }
return 0;
@@ -1373,6 +1405,10 @@ int read_firmware(struct ipod_t* ipod, char* filename, int type)
unsigned long chksum=0; /* 32 bit checksum - Rockbox .ipod style*/
unsigned char header[8]; /* Header for .ipod file */
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
if (ipod->ipod_directory[ipod->ososimage].entryOffset != 0) {
/* We have a bootloader... */
length = ipod->ipod_directory[ipod->ososimage].entryOffset;
@@ -1399,7 +1435,7 @@ int read_firmware(struct ipod_t* ipod, char* filename, int type)
return -1;
}
- if ((n = ipod_read(ipod,ipod_sectorbuf,i)) < 0) {
+ if ((n = ipod_read(ipod,i)) < 0) {
return -1;
}
@@ -1419,7 +1455,7 @@ int read_firmware(struct ipod_t* ipod, char* filename, int type)
chksum = ipod->modelnum;
for (i = 0; i < length; i++) {
/* add 8 unsigned bits but keep a 32 bit sum */
- chksum += ipod_sectorbuf[i];
+ chksum += ipod->sectorbuf[i];
}
int2be(chksum,header);
@@ -1431,7 +1467,7 @@ int read_firmware(struct ipod_t* ipod, char* filename, int type)
}
}
- n = write(outfile,ipod_sectorbuf,length);
+ n = write(outfile,ipod->sectorbuf,length);
if (n != length) {
fprintf(stderr,"[ERR] Write error - %d\n",n);
}
@@ -1458,28 +1494,28 @@ int read_directory(struct ipod_t* ipod)
return -1;
}
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) {
- fprintf(stderr,"[ERR] ipod_read(ipod,buf,0x%08x) failed in read_directory()\n", ipod->sector_size);
+ fprintf(stderr,"[ERR] ipod_read(ipod,0x%08x) failed in read_directory()\n", ipod->sector_size);
return -1;
}
- if (memcmp(ipod_sectorbuf,apple_stop_sign,sizeof(apple_stop_sign))!=0) {
+ if (memcmp(ipod->sectorbuf,apple_stop_sign,sizeof(apple_stop_sign))!=0) {
fprintf(stderr,"[ERR] Firmware partition doesn't contain Apple copyright, aborting.\n");
return -1;
}
- if (memcmp(ipod_sectorbuf+0x100,"]ih[",4)!=0) {
+ if (memcmp(ipod->sectorbuf+0x100,"]ih[",4)!=0) {
fprintf(stderr,"[ERR] Bad firmware directory\n");
return -1;
}
- version = le2ushort(ipod_sectorbuf+0x10a);
+ version = le2ushort(ipod->sectorbuf+0x10a);
if ((version != 2) && (version != 3)) {
fprintf(stderr,"[ERR] Unknown firmware format version %04x\n",
version);
}
- ipod->diroffset=le2int(ipod_sectorbuf+0x104) + 0x200;
+ ipod->diroffset=le2int(ipod->sectorbuf+0x104) + 0x200;
/* diroffset may not be sector-aligned */
x = ipod->diroffset % ipod->sector_size;
@@ -1490,13 +1526,13 @@ int read_directory(struct ipod_t* ipod)
return -1;
}
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) {
fprintf(stderr,"[ERR] Read of directory failed.\n");
return -1;
}
- p = ipod_sectorbuf + x;
+ p = ipod->sectorbuf + x;
/* A hack to detect 2nd gen Nanos - maybe there is a better way? */
if (p[0] == 0)
@@ -1504,16 +1540,16 @@ int read_directory(struct ipod_t* ipod)
/* Adjust diroffset */
ipod->diroffset += ipod->sector_size - x;
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) {
fprintf(stderr,"[ERR] Read of directory failed.\n");
return -1;
}
- p = ipod_sectorbuf;
+ p = ipod->sectorbuf;
}
ipod->ososimage = -1;
- while ((ipod->nimages < MAX_IMAGES) && (p < (ipod_sectorbuf + x + 400)) &&
+ while ((ipod->nimages < MAX_IMAGES) && (p < (ipod->sectorbuf + x + 400)) &&
((memcmp(p,"!ATA",4)==0) || (memcmp(p,"DNAN",4)==0))) {
p+=4;
if (memcmp(p,"soso",4)==0) {
@@ -1840,14 +1876,18 @@ int write_dos_partition_table(struct ipod_t* ipod)
fprintf(stderr,"[ERR] Only ipods with 512 bytes per sector are supported.\n");
return -1;
}
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
/* Firstly zero the entire MBR */
- memset(ipod_sectorbuf, 0, ipod->sector_size);
+ memset(ipod->sectorbuf, 0, ipod->sector_size);
/* Now add the partition info */
for (i=0; i < 4 ; i++)
{
- p = ipod_sectorbuf + 0x1be + i*16;
+ p = ipod->sectorbuf + 0x1be + i*16;
/* Ensure first partition is type 0, and second is 0xb */
if (i==0) { type = 0; }
@@ -1860,8 +1900,8 @@ int write_dos_partition_table(struct ipod_t* ipod)
}
/* Finally add the magic */
- ipod_sectorbuf[0x1fe] = 0x55;
- ipod_sectorbuf[0x1ff] = 0xaa;
+ ipod->sectorbuf[0x1fe] = 0x55;
+ ipod->sectorbuf[0x1ff] = 0xaa;
if (ipod_seek(ipod, 0) < 0) {
fprintf(stderr,"[ERR] Seek failed writing MBR\n");
@@ -1869,7 +1909,7 @@ int write_dos_partition_table(struct ipod_t* ipod)
}
/* Write MBR */
- if ((n = ipod_write(ipod, ipod_sectorbuf, ipod->sector_size)) < 0) {
+ if ((n = ipod_write(ipod, ipod->sector_size)) < 0) {
perror("[ERR] Write failed\n");
return -1;
}
@@ -2072,16 +2112,20 @@ static int find_key(struct ipod_t* ipod, int aupd, unsigned char* key)
/* Firstly read the security block and find the RC4 key. This is
in the sector preceeding the AUPD image. */
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
fprintf(stderr, "[INFO] Reading security block at offset 0x%08x\n",ipod->ipod_directory[aupd].devOffset-ipod->sector_size);
if (ipod_seek(ipod, ipod->fwoffset+ipod->ipod_directory[aupd].devOffset-ipod->sector_size) < 0) {
return -1;
}
- if ((n = ipod_read(ipod, ipod_sectorbuf, 512)) < 0) {
+ if ((n = ipod_read(ipod, 512)) < 0) {
return -1;
}
- n = GetSecurityBlockKey(ipod_sectorbuf, key);
+ n = GetSecurityBlockKey(ipod->sectorbuf, key);
if (n != 1)
{
@@ -2103,6 +2147,10 @@ int read_aupd(struct ipod_t* ipod, char* filename)
unsigned char key[4];
unsigned long chksum=0;
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
aupd = 0;
while ((aupd < ipod->nimages) && (ipod->ipod_directory[aupd].ftype != FTYPE_AUPD))
{
@@ -2132,7 +2180,7 @@ int read_aupd(struct ipod_t* ipod, char* filename)
i = (length+ipod->sector_size-1) & ~(ipod->sector_size-1);
- if ((n = ipod_read(ipod,ipod_sectorbuf,i)) < 0) {
+ if ((n = ipod_read(ipod,i)) < 0) {
return -1;
}
@@ -2144,12 +2192,12 @@ int read_aupd(struct ipod_t* ipod, char* filename)
/* Perform the decryption - this is standard (A)RC4 */
matrixArc4Init(&rc4, key, 4);
- matrixArc4(&rc4, ipod_sectorbuf, ipod_sectorbuf, length);
+ matrixArc4(&rc4, ipod->sectorbuf, ipod->sectorbuf, length);
chksum = 0;
for (i = 0; i < (int)length; i++) {
/* add 8 unsigned bits but keep a 32 bit sum */
- chksum += ipod_sectorbuf[i];
+ chksum += ipod->sectorbuf[i];
}
if (chksum != ipod->ipod_directory[aupd].chksum)
@@ -2165,7 +2213,7 @@ int read_aupd(struct ipod_t* ipod, char* filename)
return -1;
}
- n = write(outfile,ipod_sectorbuf,length);
+ n = write(outfile,ipod->sectorbuf,length);
if (n != length) {
fprintf(stderr,"[ERR] Write error - %d\n",n);
}
@@ -2187,6 +2235,10 @@ int write_aupd(struct ipod_t* ipod, char* filename)
struct rc4_key_t rc4;
unsigned char key[4];
+ if(ipod->sectorbuf == NULL) {
+ fprintf(stderr,"[ERR] Buffer not initialized.");
+ return -1;
+ }
/* First check that the input file is the correct type for this ipod. */
infile=open(filename,O_RDONLY);
if (infile < 0) {
@@ -2236,7 +2288,7 @@ int write_aupd(struct ipod_t* ipod, char* filename)
/* We now know we have enough space, so write it. */
fprintf(stderr,"[INFO] Reading input file...\n");
- n = read(infile,ipod_sectorbuf,length);
+ n = read(infile,ipod->sectorbuf,length);
if (n < 0) {
fprintf(stderr,"[ERR] Couldn't read input file\n");
close(infile);
@@ -2245,25 +2297,25 @@ int write_aupd(struct ipod_t* ipod, char* filename)
close(infile);
/* Pad the data with zeros */
- memset(ipod_sectorbuf+length,0,newsize-length);
+ memset(ipod->sectorbuf+length,0,newsize-length);
/* Calculate the new checksum (before we encrypt) */
chksum = 0;
for (i = 0; i < (int)length; i++) {
/* add 8 unsigned bits but keep a 32 bit sum */
- chksum += ipod_sectorbuf[i];
+ chksum += ipod->sectorbuf[i];
}
/* Perform the encryption - this is standard (A)RC4 */
matrixArc4Init(&rc4, key, 4);
- matrixArc4(&rc4, ipod_sectorbuf, ipod_sectorbuf, length);
+ matrixArc4(&rc4, ipod->sectorbuf, ipod->sectorbuf, length);
if (ipod_seek(ipod, ipod->fwoffset+ipod->ipod_directory[aupd].devOffset) < 0) {
fprintf(stderr,"[ERR] Seek failed\n");
return -1;
}
- if ((n = ipod_write(ipod,ipod_sectorbuf,newsize)) < 0) {
+ if ((n = ipod_write(ipod,newsize)) < 0) {
perror("[ERR] Write failed\n");
return -1;
}
@@ -2280,16 +2332,16 @@ int write_aupd(struct ipod_t* ipod, char* filename)
/* Read directory */
if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { return -1; }
- n=ipod_read(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_read(ipod, ipod->sector_size);
if (n < 0) { return -1; }
/* Update checksum */
- fprintf(stderr,"[INFO] Updating checksum to 0x%08x (was 0x%08x)\n",(unsigned int)chksum,le2int(ipod_sectorbuf + x + aupd*40 + 28));
- int2le(chksum,ipod_sectorbuf+x+aupd*40+28);
+ fprintf(stderr,"[INFO] Updating checksum to 0x%08x (was 0x%08x)\n",(unsigned int)chksum,le2int(ipod->sectorbuf + x + aupd*40 + 28));
+ int2le(chksum,ipod->sectorbuf+x+aupd*40+28);
/* Write directory */
if (ipod_seek(ipod, ipod->start + ipod->diroffset - x) < 0) { return -1; }
- n=ipod_write(ipod, ipod_sectorbuf, ipod->sector_size);
+ n=ipod_write(ipod, ipod->sector_size);
if (n < 0) { return -1; }
return 0;
diff --git a/rbutil/ipodpatcher/ipodpatcher.h b/rbutil/ipodpatcher/ipodpatcher.h
index dc3f100520..01f5a1bb26 100644
--- a/rbutil/ipodpatcher/ipodpatcher.h
+++ b/rbutil/ipodpatcher/ipodpatcher.h
@@ -32,16 +32,6 @@ extern "C" {
of the Apple firmware, but not the Nano's RSRC image. */
#define BUFFER_SIZE 8*1024*1024
-#ifndef _MSC_VER
-extern unsigned char* ipod_sectorbuf;
-#else
-/* MSVC needs to use dllimport to allow using it directly from a DLL.
- * See http://support.microsoft.com/kb/90530
- * Building with MSVC is only when using as DLL.
- */
-_declspec(dllimport) unsigned char* ipod_sectorbuf;
-#endif
-
extern int ipod_verbose;
#define FILETYPE_DOT_IPOD 0
diff --git a/rbutil/ipodpatcher/main.c b/rbutil/ipodpatcher/main.c
index 2d4ad3a796..12c38de704 100644
--- a/rbutil/ipodpatcher/main.c
+++ b/rbutil/ipodpatcher/main.c
@@ -164,7 +164,7 @@ int main(int argc, char* argv[])
return 1;
}
- if (ipod_alloc_buffer(&ipod_sectorbuf,BUFFER_SIZE) < 0) {
+ if (ipod_alloc_buffer(&ipod,BUFFER_SIZE) < 0) {
fprintf(stderr,"Failed to allocate memory buffer\n");
}