Changeset 2f90960 in freewrt

Timestamp:

Feb 27, 2007, 8:58:45 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

1334083d

Parents:

560055d

Message:

sync with trunk

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

Location:

package/mtd

Files:

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

package/mtd/Makefile

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

package/mtd/mtd.c

@@ -2 +2 @@
  * mtd - simple memory technology device manipulation tool
  *
- * Copyright (c) 2006 Thorsten Glaser <tg@freewrt.org>
+ * Copyright (c) 2006, 2007 Thorsten Glaser <tg@freewrt.org>
  * Copyright (C) 2005 Waldemar Brodkorb <wbx@freewrt.org>,
  *                        Felix Fietkau <nbd@openwrt.org>
@@ -33 +33 @@
 #include <limits.h>
 #include <unistd.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -63 +64 @@
 };
 
+int image_check_bcom(int, const char *);
+int image_check(int, const char *);
+int mtd_check(char *);
+int mtd_unlock(const char *);
+int mtd_open(const char *, int);
+int mtd_erase(const char *);
+int mtd_write(int, const char *, int, bool);
+void usage(void) __attribute__((noreturn));
+
 char buf[BUFSIZE];
 int buflen;
@@ -75 +85 @@
         buflen = read(imagefd, buf, 32);
         if (buflen < 32) {
-                fprintf(stdout, "Could not get image header, file too small (%ld bytes)\n", buflen);
+                fprintf(stdout, "Could not get image header, file too small (%d bytes)\n", buflen);
                 return 0;
         }
@@ -128 +138 @@
 image_check(int imagefd, const char *mtd)
 {
-        int fd, systype;
-        size_t count;
+        int systype;
         char *c;
         FILE *f;
@@ -152 +161 @@
 }
 
-int mtd_check(char *mtd)
+int
+mtd_check(char *mtd)
 {
         struct mtd_info_user mtdInfo;
@@ -263 +273 @@
 
 int
-mtd_write(int imagefd, const char *mtd, int quiet)
-{
-        int fd, i, result;
+mtd_write(int imagefd, const char *mtd, int quiet, bool do_erase)
+{
+        int fd, result;
         size_t r, w, e;
         struct mtd_info_user mtdInfo;
         struct erase_info_user mtdEraseInfo;
-        int ret = 0;
 
         fd = mtd_open(mtd, O_RDWR | O_SYNC);
@@ -297 +306 @@
 
                 /* need to erase the next block before writing data to it */
-                while (w > e) {
+                while (do_erase && w > e) {
                         mtdEraseInfo.start = e;
                         mtdEraseInfo.length = mtdInfo.erasesize;
@@ -314 +323 @@
                         fprintf(stderr, "\b\b\b[w]");
 
-                if ((result = write(fd, buf, r)) < r) {
+                if ((result = write(fd, buf, r)) < (ssize_t)r) {
                         if (result < 0) {
                                 fprintf(stderr, "Error writing image.\n");
@@ -333 +342 @@
 }
 
-void usage(void)
+void
+usage(void)
 {
         fprintf(stderr, "Usage: mtd [<options> ...] <command> [<arguments> ...] <device>\n\n"
         "The device is in the format of mtdX (eg: mtd4) or its label.\n"
-        "mtd recognizes these commands:\n"
+        "mtd recognises these commands:\n"
         "        unlock                  unlock the device\n"
         "        erase                   erase all data on device\n"
@@ -352 +362 @@
 }
 
-int main (int argc, char **argv)
-{
-        int ch, i, boot, unlock, imagefd, force, quiet, unlocked;
-        char *erase[MAX_ARGS], *device, *imagefile;
+int
+main(int argc, char **argv)
+{
+        int ch, i, boot, imagefd = -1, force, quiet, unlocked;
+        char *erase[MAX_ARGS], *device, *imagefile = NULL;
         enum {
                 CMD_ERASE,
@@ -449 +460 @@
                 mtd_erase(erase[i]);
                 if (strcmp(erase[i], device) == 0)
+                        /* this means that <device> is unlocked and erased */
                         unlocked = 1;
                 i++;
@@ -463 +475 @@
                         break;
                 case CMD_ERASE:
+                        if (unlocked) {
+                                fprintf(stderr, "Already erased: %s\n", device);
+                                break;
+                        }
                         if (quiet < 2)
                                 fprintf(stderr, "Erasing %s ...\n", device);
@@ -470 +486 @@
                         if (quiet < 2)
                                 fprintf(stderr, "Writing from %s to %s ... ", imagefile, device);
-                        mtd_write(imagefd, device, quiet);
+                        mtd_write(imagefd, device, quiet, (unlocked == 0));
                         if (quiet < 2)
                                 fprintf(stderr, "\n");
@@ -479 +495 @@
 
         if (boot) {
+                if (quiet < 2)
+                        fprintf(stderr, "\nRebooting ... ");
                 fflush(stdout);
+                fflush(stderr);
                 syscall(SYS_reboot,LINUX_REBOOT_MAGIC1,LINUX_REBOOT_MAGIC2,LINUX_REBOOT_CMD_RESTART,NULL);
         }