Changeset 15460

Timestamp:

10/13/10 21:41:47 (3 years ago)

Author:

BrainSlayer

Message:

buffered write

File:

• src/router/httpd/modules/upgrade_x86.c (modified) (2 diffs)

src/router/httpd/modules/upgrade_x86.c

@@ -206 +206 @@
                 fseek(in, 0, SEEK_END);
                 long mtdlen = ftell(in);
-                fseek(in, mtdlen-(65536*2), SEEK_SET);
+                fseek(in, mtdlen - (65536 * 2), SEEK_SET);
                 fwrite(mem, 65536, 1, in);
                 fclose(in);
                 eval("sync");
                 in = fopen(drive, "rb");
-                fseek(in, mtdlen-(65536*2), SEEK_SET);
+                fseek(in, mtdlen - (65536 * 2), SEEK_SET);
                 fread(mem, 65536, 1, in);
                 fclose(in);
@@ -218 +218 @@
         fprintf(stderr, "write system\n");
         FILE *out = fopen(drive, "r+b");
-        for (i = 0; i < linuxsize; i++)
-                putc(getc(fifo), out);
+        char *flashbuf = (char *)malloc(linuxsize);
+        if (!flashbuf)          // not enough memory, use direct way
+        {
+                for (i = 0; i < linuxsize; i++)
+                        putc(getc(fifo), out);
+        } else {
+                //read into temp buffer
+                fread(flashbuf, linuxsize, 1, fifo);
+                fwrite(flashbuf, linuxsize, 1, out);
+                free(flashbuf);
+        }
         fclose(out);
         fprintf(stderr, "sync system\n");
-
         sysprintf("sync");
         sysprintf("sync");