Changeset 2a24c7cd in freewrt for package/mtd

Timestamp:

Apr 22, 2007, 3:25:18 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

bc551bda

Parents:

69447cd

Message:

sync with trunk

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@2411 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/mtd

Files:

• Makefile (modified) (1 diff)
• mtd.c (modified) (5 diffs)

package/mtd/Makefile

@@ -9 +9 @@
 PKG_NAME:=              mtd
 PKG_VERSION:=           1.0
-PKG_RELEASE:=           6
-
+PKG_RELEASE:=           7
 WRKSRC=                 ${WRKDIR}/$(PKG_NAME)
 DISTFILES:=

package/mtd/mtd.c

@@ -40 +40 @@
 #include <errno.h>
 #include <error.h>
+#include <err.h>
 #include <time.h>
 #include <string.h>
@@ -73 +74 @@
 void usage(void) __attribute__((noreturn));
 
-char buf[BUFSIZE];
+typedef char char_aligned_32bit __attribute__((aligned (4), may_alias));
+
+char_aligned_32bit buf[BUFSIZE];
 int buflen;
 
@@ -99 +102 @@
                         break;
                 case 0x464c457f: /* ELF Netgear WGT634u */
-                        fprintf(stderr, "found elf header\n");
-                        lseek(imagefd,128*1024,SEEK_SET);
+                        fprintf(stderr, "found ELF header\n");
+                        if (lseek(imagefd, 128*1024, SEEK_SET) == -1) {
+                                if (errno != ESPIPE)
+                                        err(1, "lseek");
+                                /*
+                                 * the lseek failed because stdin is a pipe,
+                                 * so fake it; we know we've already read
+                                 * 32 bytes in the above call, so just read
+                                 * in (128 * 1024 - 32) bytes now, modulo
+                                 * sizeof (buf). why is this 128 KiB btw,
+                                 * wouldn't it be better to parse the ELF
+                                 * header?
+                                 */
+                                buflen = 128 * 1024 - 32;
+                                while (buflen) {
+                                        ssize_t n;
+
+                                        n = read(imagefd, buf,
+                                            MIN((size_t)buflen, sizeof (buf)));
+                                        if (n < 0)
+                                                err(1, "read");
+                                        buflen -= n;
+                                }
+                        }
                         buflen = read(imagefd, buf, sizeof(struct trx_header));
                         break;
@@ -144 +169 @@
         systype = SYSTYPE_UNKNOWN;
         f = fopen("/proc/cpuinfo", "r");
-        while (!feof(f) && (fgets(buf, BUFSIZE - 1, f) != NULL)) {
-                if ((strncmp(buf, "system type", 11) == 0) && (c = strchr(buf, ':'))) {
+        while (!feof(f) && (fgets((char *)buf, BUFSIZE - 1, f) != NULL)) {
+                if ((memcmp(buf, "system type", 11) == 0) &&
+                    (c = strchr((char *)buf, ':'))) {
                         c += 2;
                         if (strncmp(c, "Broadcom BCM947XX", 17) == 0)
@@ -366 +392 @@
 {
         int ch, i, boot, imagefd = -1, force, quiet, unlocked;
-        char *erase[MAX_ARGS], *device, *imagefile = NULL;
+        char *erase[MAX_ARGS], *device;
+        const char *imagefile = NULL;
         enum {
                 CMD_ERASE,